Some trivial cleanup

A couple of commits with trivial cleanup that reflects feedback on other branch.