Hardened and neatended the print functions