Whitespace additions and added comments