minor style fixes and comments