Reduce some clutter