Indentation cleanup and removing extra sprintf
Merging of proper tof code