Refactor Command