cleanup, nicer menu