Merge branch 'ns/pretty-format'