reduce nesting per review