Jirabot refactoring