clean up includes and formatting in ratfracder and conv