refactoring tickets