Refactored simplification.