Make minor optimizations to Format