Did pep8 cleanup on ALL THEN THINGS!! :D