Four: renamed helpers function
Four: various cleanups + rearganizational things