Refactoring: Use python f-Strings