Reduce some duplication