Styleguide improvments