Refactored redundancy