Minor code clean-up. Menu modified