Refactored deeply nested section