Refactoring - Menu, Analyzer