Menu code cleaup (minor)