Fix styleguide corrections