Cosmetic changes

I made some cosmetic changes you could merge into your repository. (Originally from #12.)