More styleguide conformance