Code Clean up of Menu Finder Class