Refactoring Consumers