minor style fixes and changes