Move comment formatting into Presenter