more #1 rubocop fixes