Refactoring HandlingSteps