Trivial stylistic changes before large refactor!