Wiki formatter refactoring