Clean up Comment class