64 bit funcs to own file, minor formatting