Code style
Reduced printing code to a minimum
Header fixes