a few styleguide fixes