formatter improvements