Minor white space and comment changes