Reduce more duplication