Formatter changes