Cleaned up comments view