Refactoring b