Remove color variable - not used
Move command handling back into main class