Removing unnecessary nesting