More minor style changes