Cleaned up comments additionally.