Cleaned up comments and removed whitespace