oalders/code cleanup

Makes our coding style a little more consistent.