more styleguide violation fixes