Move comment formatting code to a class
Break out classes and add specs
Merge branch 'better-specs'

* better-specs:
  Break out classes and add specs
  Move comment formatting code to a class