Tidy up the source