Refactoring to improve wiki reporting format