Move comment logic to its own class