Code styleguide fixes