This is a code simplification to remove reduplicated code
by concentrating and abstracting shared code.

Detailed Changes: