Adapt code to be a bit more Python-y and save a couple of lines

[CmdQ]

I noticed a few thing's I would've done differently and took a shot.

I tried to stay close to your solution and not rewrite everything or aggressively go for fewer lines. I'd say it's still very similar with just a few sprinkles of idiomatic Python here and there.