Reduced code, added single header printer