Major cleanup to reduce clutter when printing