Added comments and whitespace