remove more duplication