Remove more duplication