Refactored the <enable/disable> commands to be cleaner and except more
robust input.
Refactored many of the commands to be cleaner and easier to read.