[Cleanup] Cleanup Var and CommandListener classes.