minor style and comment changes