Reformat (no pun intended) for new python string formatting style