Menu code unclutter