Fixing more rubocop warnings