Code cleanup (Menu Component)