Small changes to remove static analysis noise and simplify flow
small changes to previous commit from Steve's cleanup