Use f-strings for string formatting
This MR updates a couple of modules to use f-strings for string formatting, it's easier to read and maintain, IMO.
This MR updates a couple of modules to use f-strings for string formatting, it's easier to read and maintain, IMO.