A wee bit of code review

The project looks great!

Really, these changes are quite small, and they really don't make the code much better. Just a small amount of refactoring.