tidy up to prepare for pull request