More minor style modifications