Step::step_class refactoring