tidy up the sources a little.