Refactored step definitions