further reduce lint
remove depth of nested block