couple small improvements to format processing