Minor fixes/code style.