Code cleanup

The new pull requests UI is confusing; was planning to do one PR per change so you could pick and choose, but hey. I got bored of packing to move so I did some code cleanup, I do days off good.