Minor fixes in whitespacing and comments