small refactor on step method