Styleguide changes