Code review. Minor tweaks to coding style.