Use keywords in format-strings for better code readability (fixed previous commit)