Change % interpolation to .format()
Take further measures to make diff simpler