fixing more styleguide violations