Refactored format strings