This is not a necessary change, IMO it is good to avoid too much nesting where possible