Tidy up Comment class and directly instantiate with hash.