Cleanup code
Merge pull request #737 from sergeyklay/master

Cleanup code of Menu class