WIP Review the code and make some tweaks

A few small changes for dead or copypasta'd code, and removing pry
statements. Also a comment about code that I was unsure about.