Cleaned up comments and indentation