Minor cleanup change
Added 'exit' and 'q' as commands to quit