Minor cleanup, and sceleton for built in func. float