Menu, little cleanup