Styleguide related tweaks