1.[code cleanup for commandEngine]