Refactor Commands