Print style improvements from @markdalgleish