Updates per pull request, minor style tweaks.