Small refactors
Small refactors, comments, and cleanup
Refactor and clean up Comment class