Fix indentation
Improvements to print support