Cleaned up the command methods
Cleaned up some more, but still no handling off unexpected messages (should never happen....... right?)