Cleaned up comments again