Adapted review feedback

Incorporates some ideas from @jeremyfield (thanks!)