Reduce duplication more