Fixed some white space and comments