mini cleanup
ability to give lists name as switch argument