Refactor Comment class