Fix indenting, rename a function, fix commenting style.