Minor format and comment changes