Cleaning up code and pushing more common routines to Helper modules.