Tidy up source