Reduce complexity and duplication