Separate out multi-line-output and general clean up