Some minor style fixes

There are a few inconsistencies in the coding style used, so this attempts to address them.