Refactoring tickets [skip ci]