Comment cleanup

Cleaned up comments