Making menu class more functional