wip: refactoring commenter system