Refactored the commands done so far to work well together