just cleaned up a bit

I deleted some unnecessary code and/or comments and changed the flow of
the menu so that there are two while loops nested in one overarching
"while the user doesn't enter q" loop