@@ -21,7 +21,6 @@
 // TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #endregion
 
-using System;
 using System.Data;
 using System.Data.Common;
 using JetBrains.Annotations;
@@ -33,14 +32,14 @@ namespace Npgsql
     /// </summary>
     /// <param name="sender">The source of the event.</param>
     /// <param name="e">A <see cref="NpgsqlRowUpdatedEventArgs">NpgsqlRowUpdatedEventArgs</see> that contains the event data.</param>
-    public delegate void NpgsqlRowUpdatedEventHandler(Object sender, NpgsqlRowUpdatedEventArgs e);
+    public delegate void NpgsqlRowUpdatedEventHandler(object sender, NpgsqlRowUpdatedEventArgs e);
 
     /// <summary>
     /// Represents the method that handles the <see cref="NpgsqlDataAdapter.RowUpdating">RowUpdating</see> events.
     /// </summary>
     /// <param name="sender">The source of the event.</param>
     /// <param name="e">A <see cref="NpgsqlRowUpdatingEventArgs">NpgsqlRowUpdatingEventArgs</see> that contains the event data.</param>
-    public delegate void NpgsqlRowUpdatingEventHandler(Object sender, NpgsqlRowUpdatingEventArgs e);
+    public delegate void NpgsqlRowUpdatingEventHandler(object sender, NpgsqlRowUpdatingEventArgs e);
 
     /// <summary>
     /// This class represents an adapter from many commands: select, update, insert and delete to fill <see cref="System.Data.DataSet">Datasets.</see>
@@ -69,9 +68,7 @@ public NpgsqlDataAdapter() {}
         /// </summary>
         /// <param name="selectCommand"></param>
         public NpgsqlDataAdapter(NpgsqlCommand selectCommand)
-        {
-            SelectCommand = selectCommand;
-        }
+            => SelectCommand = selectCommand;
 
         /// <summary>
         /// Constructor.
 
@@ -416,7 +416,7 @@ public static NpgsqlRange<T> Parse([NotNull] string value)
             if (!upperInclusive && !upperExclusive)
                 throw new FormatException("Malformed range literal. Missing right parenthesis or bracket.");
 
-            int separator = value.IndexOf(BoundSeparator);
+            var separator = value.IndexOf(BoundSeparator);
 
             if (separator == -1)
                 throw new FormatException("Malformed range literal. Missing comma after lower bound.");
 
@@ -60,7 +60,7 @@ class TypeMappingAttribute : Attribute
         /// </param>
         internal TypeMappingAttribute(string pgName, NpgsqlDbType? npgsqlDbType, [CanBeNull] DbType[] dbTypes, [CanBeNull] Type[] clrTypes, DbType? inferredDbType)
         {
-            if (String.IsNullOrWhiteSpace(pgName))
+            if (string.IsNullOrWhiteSpace(pgName))
                 throw new ArgumentException("pgName can't be empty", nameof(pgName));
 
             PgName = pgName;
@@ -141,12 +141,12 @@ public override string ToString()
             if (DbTypes.Length > 0)
             {
                 sb.Append(" DbTypes=");
-                sb.Append(String.Join(",", DbTypes.Select(t => t.ToString())));
+                sb.Append(string.Join(",", DbTypes.Select(t => t.ToString())));
             }
             if (ClrTypes.Length > 0)
             {
                 sb.Append(" ClrTypes=");
-                sb.Append(String.Join(",", ClrTypes.Select(t => t.Name)));
+                sb.Append(string.Join(",", ClrTypes.Select(t => t.Name)));
             }
             sb.AppendFormat("]");
             return sb.ToString();
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class TypeMappingAttribute : Attribute`
`60`	`60`	`/// </param>`
`61`	`61`	`internal TypeMappingAttribute(string pgName, NpgsqlDbType? npgsqlDbType, [CanBeNull] DbType[] dbTypes, [CanBeNull] Type[] clrTypes, DbType? inferredDbType)`
`62`	`62`	`{`
`63`		`- if (String.IsNullOrWhiteSpace(pgName))`
	`63`	`+ if (string.IsNullOrWhiteSpace(pgName))`
`64`	`64`	`throw new ArgumentException("pgName can't be empty", nameof(pgName));`
`65`	`65`
`66`	`66`	`PgName = pgName;`
`@@ -141,12 +141,12 @@ public override string ToString()`
`141`	`141`	`if (DbTypes.Length > 0)`
`142`	`142`	`{`
`143`	`143`	`sb.Append(" DbTypes=");`
`144`		`- sb.Append(String.Join(",", DbTypes.Select(t => t.ToString())));`
	`144`	`+ sb.Append(string.Join(",", DbTypes.Select(t => t.ToString())));`
`145`	`145`	`}`
`146`	`146`	`if (ClrTypes.Length > 0)`
`147`	`147`	`{`
`148`	`148`	`sb.Append(" ClrTypes=");`
`149`		`- sb.Append(String.Join(",", ClrTypes.Select(t => t.Name)));`
	`149`	`+ sb.Append(string.Join(",", ClrTypes.Select(t => t.Name)));`
`150`	`150`	`}`
`151`	`151`	`sb.AppendFormat("]");`
`152`	`152`	`return sb.ToString();`