Lots of the changes around here are basically just line length changes to keep pep8 happy