Eliminate more duplication