Refactor printing

Change-Id: I19850154ef2798afff511e4490a268ce38e8cbae
75 files changed