tightened up the format to be more pythonic