Refactoring rabbit