Refactoring step definitions