Refactoring use cases