More print cleanup