Address some simple review comments.
Simplify loop.