added .format in a few cases