Reduce nesting as per PR feedback