Merge "Refactor printing"