Improve styleguide comments