Source tidy up