Tidy up source files