Refactored application of effects