Minor reformatting of menu code