More reformatting to fix a few issues which appeared when deployed to GitHub.