Improve styleguide