more ruby/rubocop fixes