minor whitespace formatting and comment changes