Cleaned up commands to use enum class. Updated all code.