Replace old-style '%' by .format(..), further style fixed