Added space and lines formats, in-between diffy and terse