Tidy up the code. Also test commit to GitHub.