source tidy up