Automatically fix some rubocop issues with "rubocop -a"
Fix more rubocop issues