Cleanup code of Menu class