minor style changes and fixes