Some styleguide fixes