Refactor break command