Move diff printing/formatting to CLI helper

Balanced responsibility :)