who knows if it was actually better before, but this changes makes it *less* pep8 compliant (87 columns)