Tidy up model source files