code style cleanup of the mach files