Moving to .format() & some more line-too-long cleanup