More minor code cleanup

The codebase is still a bit rough around the edges due to me changing my
coding style so many times in the earlier stages of development...