A few tweak to the styleguide