Fixing up formatting and such: removing rendundant includes, removing unused files, deleting the excessive whitespace, etc.