styleguide improvements