Refacotring commands