Refactored commands a bit.