cleaned up CommandArea