More rubocop issues fixed