Since now we won't support Python < 3.7, it is a good chance to move to using f-strings where possible