refactor: small cleanup of some string formatting (#2130)Some quick random refactors I spotted while looking at something else.