Revert some unneccesary changes cluttering up the diff (whitespace, etc)