Cleaned up comments and whitespace