Knocked down HelperFuncs classes to smaller specific classes