Cleaned up command mapping.