Reduce some redundancy