Style
More minor style changes