Make corrections for styleguide conformance