cleaned up white space and comments