Code review: Obey the styleguide

Not doing a pull request since the styleguide document already says this. Just wanted to reference it here as well.