Housecleaning

Some of this might break stuff. I recommend pulling these changes down locally before merging them to test that your local installation works.

As a side note, this is why testing is helpful.

None of this is meant as a critique, just doing some housecleaning so I can get a little more familiar with the code.