Code review feedback

And cleanup