Added back comments and whitespace