[TASK] Smaller if for CommandController