diff --git a/src/TinyPNG/AmazonS3Configuration.cs b/src/TinyPNG/AmazonS3Configuration.cs
index 31d5b45..9a6a2cc 100644
--- a/src/TinyPNG/AmazonS3Configuration.cs
+++ b/src/TinyPNG/AmazonS3Configuration.cs
@@ -1,5 +1,5 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+
 namespace TinyPng
 {
     public class AmazonS3Configuration 
diff --git a/src/TinyPNG/Extensions.cs b/src/TinyPNG/Extensions.cs
index 6875891..a82c458 100644
--- a/src/TinyPNG/Extensions.cs
+++ b/src/TinyPNG/Extensions.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Threading.Tasks;
 using TinyPng.Responses;
 
-namespace TinyPNG
+namespace TinyPng
 {
     public static class Extensions
     {
diff --git a/src/TinyPNG/Responses/ApiErrorResponse.cs b/src/TinyPNG/Responses/ApiErrorResponse.cs
index d44997a..25dbd38 100644
--- a/src/TinyPNG/Responses/ApiErrorResponse.cs
+++ b/src/TinyPNG/Responses/ApiErrorResponse.cs
@@ -1,5 +1,4 @@
-
-namespace TinyPng.Responses
+namespace TinyPng.Responses
 {
     public class ApiErrorResponse
     {
diff --git a/src/TinyPNG/Responses/TinyPngCompressResponse.cs b/src/TinyPNG/Responses/TinyPngCompressResponse.cs
index 056e998..fdda53b 100644
--- a/src/TinyPNG/Responses/TinyPngCompressResponse.cs
+++ b/src/TinyPNG/Responses/TinyPngCompressResponse.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using System;
 
 namespace TinyPng.Responses
 {
diff --git a/tests/TinyPng.Tests/TinyPngTests.cs b/tests/TinyPng.Tests/TinyPngTests.cs
index a7289d6..c04a805 100644
--- a/tests/TinyPng.Tests/TinyPngTests.cs
+++ b/tests/TinyPng.Tests/TinyPngTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using TinyPNG;
 using Xunit;
 
 namespace TinyPng.Tests