Cleans up code, fixes warnings, fixes headers, fixes naming convention, removes unecessary classes