some more styleguide fixes