Refactored system:steps