Minor cleanup of the printing functions