Changed from [% substitution] to format for better consistency