#44 styleguide fixes