tidy up source.