diff --git a/src/main/java/com/ecwid/consul/ConsulRequest.java b/src/main/java/com/ecwid/consul/ConsulRequest.java
index f4e0dd09..b0fd3117 100644
--- a/src/main/java/com/ecwid/consul/ConsulRequest.java
+++ b/src/main/java/com/ecwid/consul/ConsulRequest.java
@@ -4,6 +4,6 @@
 
 public interface ConsulRequest {
 
-	public List<UrlParameters> asUrlParameters();
+	List<UrlParameters> asUrlParameters();
 
 }
diff --git a/src/main/java/com/ecwid/consul/UrlParameters.java b/src/main/java/com/ecwid/consul/UrlParameters.java
index dc393639..31ba1fed 100644
--- a/src/main/java/com/ecwid/consul/UrlParameters.java
+++ b/src/main/java/com/ecwid/consul/UrlParameters.java
@@ -7,6 +7,6 @@
  */
 public interface UrlParameters {
 
-	public List<String> toUrlParameters();
+	List<String> toUrlParameters();
 
 }
diff --git a/src/main/java/com/ecwid/consul/Utils.java b/src/main/java/com/ecwid/consul/Utils.java
index 0bfad179..c6b7a643 100644
--- a/src/main/java/com/ecwid/consul/Utils.java
+++ b/src/main/java/com/ecwid/consul/Utils.java
@@ -38,7 +38,7 @@ public static String generateUrl(String baseUrl, List<UrlParameters> params) {
 			return baseUrl;
 		}
 
-		List<String> allParams = new ArrayList<String>();
+		List<String> allParams = new ArrayList<>();
 		for (UrlParameters item : params) {
 			if (item != null) {
 				allParams.addAll(item.toUrlParameters());
@@ -65,7 +65,7 @@ public static Map<String, String> createTokenMap(String token) {
 	}
 
 	public static String toSecondsString(long waitTime) {
-		return String.valueOf(waitTime) + "s";
+		return waitTime + "s";
 	}
 
 	public static String assembleAgentAddress(String host, int port, String path) {
diff --git a/src/main/java/com/ecwid/consul/transport/HttpTransport.java b/src/main/java/com/ecwid/consul/transport/HttpTransport.java
index 60e9cfef..ea2089bd 100644
--- a/src/main/java/com/ecwid/consul/transport/HttpTransport.java
+++ b/src/main/java/com/ecwid/consul/transport/HttpTransport.java
@@ -1,16 +1,15 @@
 package com.ecwid.consul.transport;
 
-import java.util.Map;
 
 /**
  * @author Vasily Vasilkov (vgv@ecwid.com)
  */
 public interface HttpTransport {
 
-	public HttpResponse makeGetRequest(HttpRequest request);
+	HttpResponse makeGetRequest(HttpRequest request);
 
-	public HttpResponse makePutRequest(HttpRequest request);
+	HttpResponse makePutRequest(HttpRequest request);
 
-	public HttpResponse makeDeleteRequest(HttpRequest request);
+	HttpResponse makeDeleteRequest(HttpRequest request);
 
 }
diff --git a/src/main/java/com/ecwid/consul/v1/ConsulRawClient.java b/src/main/java/com/ecwid/consul/v1/ConsulRawClient.java
index f5117f3c..7bb56840 100644
--- a/src/main/java/com/ecwid/consul/v1/ConsulRawClient.java
+++ b/src/main/java/com/ecwid/consul/v1/ConsulRawClient.java
@@ -133,8 +133,8 @@ public HttpResponse makeGetRequest(String endpoint, List<UrlParameters> urlParam
 		url = Utils.generateUrl(url, urlParams);
 
 		HttpRequest request = HttpRequest.Builder.newBuilder()
-			.setUrl(url)
-			.build();
+				.setUrl(url)
+				.build();
 
 		return httpTransport.makeGetRequest(request);
 	}
@@ -144,9 +144,9 @@ public HttpResponse makeGetRequest(Request request) {
 		url = Utils.generateUrl(url, request.getUrlParameters());
 
 		HttpRequest httpRequest = HttpRequest.Builder.newBuilder()
-			.setUrl(url)
-			.addHeaders(Utils.createTokenMap(request.getToken()))
-			.build();
+				.setUrl(url)
+				.addHeaders(Utils.createTokenMap(request.getToken()))
+				.build();
 
 		return httpTransport.makeGetRequest(httpRequest);
 	}
@@ -156,23 +156,23 @@ public HttpResponse makePutRequest(String endpoint, String content, UrlParameter
 		url = Utils.generateUrl(url, urlParams);
 
 		HttpRequest request = HttpRequest.Builder.newBuilder()
-			.setUrl(url)
-			.setContent(content)
-			.build();
+				.setUrl(url)
+				.setContent(content)
+				.build();
 
 		return httpTransport.makePutRequest(request);
 	}
 
 	public HttpResponse makePutRequest(Request request) {
-		//,  String endpoint, byte[] binaryContent, UrlParameters... urlParams
+		//  String endpoint, byte[] binaryContent, UrlParameters... urlParams
 		String url = prepareUrl(agentAddress + request.getEndpoint());
 		url = Utils.generateUrl(url, request.getUrlParameters());
 
 		HttpRequest httpRequest = HttpRequest.Builder.newBuilder()
-			.setUrl(url)
-			.setBinaryContent(request.getBinaryContent())
-			.addHeaders(Utils.createTokenMap(request.getToken()))
-			.build();
+				.setUrl(url)
+				.setBinaryContent(request.getBinaryContent())
+				.addHeaders(Utils.createTokenMap(request.getToken()))
+				.build();
 
 		return httpTransport.makePutRequest(httpRequest);
 	}
@@ -182,9 +182,9 @@ public HttpResponse makeDeleteRequest(Request request) {
 		url = Utils.generateUrl(url, request.getUrlParameters());
 
 		HttpRequest httpRequest = HttpRequest.Builder.newBuilder()
-			.setUrl(url)
-			.addHeaders(Utils.createTokenMap(request.getToken()))
-			.build();
+				.setUrl(url)
+				.addHeaders(Utils.createTokenMap(request.getToken()))
+				.build();
 
 		return httpTransport.makeDeleteRequest(httpRequest);
 	}
diff --git a/src/main/java/com/ecwid/consul/v1/agent/AgentClient.java b/src/main/java/com/ecwid/consul/v1/agent/AgentClient.java
index fc9f1862..956bd378 100644
--- a/src/main/java/com/ecwid/consul/v1/agent/AgentClient.java
+++ b/src/main/java/com/ecwid/consul/v1/agent/AgentClient.java
@@ -11,61 +11,61 @@
  */
 public interface AgentClient {
 
-	public Response<Map<String, Check>> getAgentChecks();
+	Response<Map<String, Check>> getAgentChecks();
 
-	public Response<Map<String, Service>> getAgentServices();
+	Response<Map<String, Service>> getAgentServices();
 
-	public Response<List<Member>> getAgentMembers();
+	Response<List<Member>> getAgentMembers();
 
-	public Response<Self> getAgentSelf();
+	Response<Self> getAgentSelf();
 	
-	public Response<Self> getAgentSelf(String token);
+	Response<Self> getAgentSelf(String token);
 
-	public Response<Void> agentSetMaintenance(boolean maintenanceEnabled);
+	Response<Void> agentSetMaintenance(boolean maintenanceEnabled);
 
-	public Response<Void> agentSetMaintenance(boolean maintenanceEnabled, String reason);
+	Response<Void> agentSetMaintenance(boolean maintenanceEnabled, String reason);
 
-	public Response<Void> agentJoin(String address, boolean wan);
+	Response<Void> agentJoin(String address, boolean wan);
 
-	public Response<Void> agentForceLeave(String node);
+	Response<Void> agentForceLeave(String node);
 
-	public Response<Void> agentCheckRegister(NewCheck newCheck);
+	Response<Void> agentCheckRegister(NewCheck newCheck);
 
-	public Response<Void> agentCheckRegister(NewCheck newCheck, String token);
+	Response<Void> agentCheckRegister(NewCheck newCheck, String token);
 
-	public Response<Void> agentCheckDeregister(String checkId);
+	Response<Void> agentCheckDeregister(String checkId);
 
-	public Response<Void> agentCheckDeregister(String checkId, String token);
+	Response<Void> agentCheckDeregister(String checkId, String token);
 
-	public Response<Void> agentCheckPass(String checkId);
+	Response<Void> agentCheckPass(String checkId);
 
-	public Response<Void> agentCheckPass(String checkId, String note);
+	Response<Void> agentCheckPass(String checkId, String note);
 
-	public Response<Void> agentCheckPass(String checkId, String note, String token);
+	Response<Void> agentCheckPass(String checkId, String note, String token);
 
-	public Response<Void> agentCheckWarn(String checkId);
+	Response<Void> agentCheckWarn(String checkId);
 
-	public Response<Void> agentCheckWarn(String checkId, String note);
+	Response<Void> agentCheckWarn(String checkId, String note);
 
-	public Response<Void> agentCheckWarn(String checkId, String note, String token);
+	Response<Void> agentCheckWarn(String checkId, String note, String token);
 
-	public Response<Void> agentCheckFail(String checkId);
+	Response<Void> agentCheckFail(String checkId);
 
-	public Response<Void> agentCheckFail(String checkId, String note);
+	Response<Void> agentCheckFail(String checkId, String note);
 
-	public Response<Void> agentCheckFail(String checkId, String note, String token);
+	Response<Void> agentCheckFail(String checkId, String note, String token);
 
-	public Response<Void> agentServiceRegister(NewService newService);
+	Response<Void> agentServiceRegister(NewService newService);
 
-	public Response<Void> agentServiceRegister(NewService newService, String token);
+	Response<Void> agentServiceRegister(NewService newService, String token);
 
-	public Response<Void> agentServiceDeregister(String serviceId);
+	Response<Void> agentServiceDeregister(String serviceId);
 
-	public Response<Void> agentServiceDeregister(String serviceId, String token);
+	Response<Void> agentServiceDeregister(String serviceId, String token);
 
-	public Response<Void> agentServiceSetMaintenance(String serviceId, boolean maintenanceEnabled);
+	Response<Void> agentServiceSetMaintenance(String serviceId, boolean maintenanceEnabled);
 
-	public Response<Void> agentServiceSetMaintenance(String serviceId, boolean maintenanceEnabled, String reason);
+	Response<Void> agentServiceSetMaintenance(String serviceId, boolean maintenanceEnabled, String reason);
 
-	public Response<Void> agentReload();
+	Response<Void> agentReload();
 }
diff --git a/src/main/java/com/ecwid/consul/v1/catalog/CatalogClient.java b/src/main/java/com/ecwid/consul/v1/catalog/CatalogClient.java
index 19c04d0d..ababf9fc 100644
--- a/src/main/java/com/ecwid/consul/v1/catalog/CatalogClient.java
+++ b/src/main/java/com/ecwid/consul/v1/catalog/CatalogClient.java
@@ -15,19 +15,19 @@
  */
 public interface CatalogClient {
 
-	public Response<Void> catalogRegister(CatalogRegistration catalogRegistration);
+	Response<Void> catalogRegister(CatalogRegistration catalogRegistration);
 
-	public Response<Void> catalogRegister(CatalogRegistration catalogRegistration, String token);
+	Response<Void> catalogRegister(CatalogRegistration catalogRegistration, String token);
 
 	// -------------------------------------------------------------------------------
 
-	public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration);
+	Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration);
 
-	public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration, String token);
+	Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration, String token);
 
 	// -------------------------------------------------------------------------------
 
-	public Response<List<String>> getCatalogDatacenters();
+	Response<List<String>> getCatalogDatacenters();
 
 	// -------------------------------------------------------------------------------
 
@@ -35,9 +35,9 @@ public interface CatalogClient {
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogNodes(CatalogNodesRequest catalogNodesRequest)}
 	 */
 	@Deprecated
-	public Response<List<Node>> getCatalogNodes(QueryParams queryParams);
+	Response<List<Node>> getCatalogNodes(QueryParams queryParams);
 
-	public Response<List<Node>> getCatalogNodes(CatalogNodesRequest catalogNodesRequest);
+	Response<List<Node>> getCatalogNodes(CatalogNodesRequest catalogNodesRequest);
 
 	// -------------------------------------------------------------------------------
 
@@ -45,15 +45,15 @@ public interface CatalogClient {
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogServices(CatalogServicesRequest catalogServicesRequest)}
 	 */
 	@Deprecated
-	public Response<Map<String, List<String>>> getCatalogServices(QueryParams queryParams);
+	Response<Map<String, List<String>>> getCatalogServices(QueryParams queryParams);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogServices(CatalogServicesRequest catalogServicesRequest)}
 	 */
 	@Deprecated
-	public Response<Map<String, List<String>>> getCatalogServices(QueryParams queryParams, String token);
+	Response<Map<String, List<String>>> getCatalogServices(QueryParams queryParams, String token);
 
-	public Response<Map<String, List<String>>> getCatalogServices(CatalogServicesRequest catalogServicesRequest);
+	Response<Map<String, List<String>>> getCatalogServices(CatalogServicesRequest catalogServicesRequest);
 
 	// -------------------------------------------------------------------------------
 
@@ -61,35 +61,35 @@ public interface CatalogClient {
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogService(String serviceName, CatalogServiceRequest catalogServiceRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, QueryParams queryParams);
+	Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, QueryParams queryParams);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogService(String serviceName, CatalogServiceRequest catalogServiceRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, String tag, QueryParams queryParams);
+	Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, String tag, QueryParams queryParams);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogService(String serviceName, CatalogServiceRequest catalogServiceRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, QueryParams queryParams, String token);
+	Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, QueryParams queryParams, String token);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogService(String serviceName, CatalogServiceRequest catalogServiceRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, String tag, QueryParams queryParams, String token);
+	Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, String tag, QueryParams queryParams, String token);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getCatalogService(String serviceName, CatalogServiceRequest catalogServiceRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, String[] tags, QueryParams queryParams, String token);
+	Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, String[] tags, QueryParams queryParams, String token);
 
-	public Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, CatalogServiceRequest catalogServiceRequest);
+	Response<List<com.ecwid.consul.v1.catalog.model.CatalogService>> getCatalogService(String serviceName, CatalogServiceRequest catalogServiceRequest);
 
 	// -------------------------------------------------------------------------------
 
-	public Response<CatalogNode> getCatalogNode(String nodeName, QueryParams queryParams);
+	Response<CatalogNode> getCatalogNode(String nodeName, QueryParams queryParams);
 }
diff --git a/src/main/java/com/ecwid/consul/v1/coordinate/CoordinateClient.java b/src/main/java/com/ecwid/consul/v1/coordinate/CoordinateClient.java
index 0aa53f11..ca01a6df 100644
--- a/src/main/java/com/ecwid/consul/v1/coordinate/CoordinateClient.java
+++ b/src/main/java/com/ecwid/consul/v1/coordinate/CoordinateClient.java
@@ -12,8 +12,8 @@
  */
 public interface CoordinateClient {
 
-	public Response<List<Datacenter>> getDatacenters();
+	Response<List<Datacenter>> getDatacenters();
 
-	public Response<List<Node>> getNodes(QueryParams queryParams);
+	Response<List<Node>> getNodes(QueryParams queryParams);
 
 }
diff --git a/src/main/java/com/ecwid/consul/v1/event/EventClient.java b/src/main/java/com/ecwid/consul/v1/event/EventClient.java
index bdae1daf..417d5bcc 100644
--- a/src/main/java/com/ecwid/consul/v1/event/EventClient.java
+++ b/src/main/java/com/ecwid/consul/v1/event/EventClient.java
@@ -12,7 +12,7 @@
  */
 public interface EventClient {
 
-	public Response<Event> eventFire(String event, String payload, EventParams eventParams, QueryParams queryParams);
+	Response<Event> eventFire(String event, String payload, EventParams eventParams, QueryParams queryParams);
 
 	// -------------------------------------------------------------------------------
 
@@ -20,14 +20,14 @@ public interface EventClient {
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #eventList(EventListRequest eventListRequest)}
 	 */
 	@Deprecated
-	public Response<List<Event>> eventList(QueryParams queryParams);
+	Response<List<Event>> eventList(QueryParams queryParams);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #eventList(EventListRequest eventListRequest)}
 	 */
 	@Deprecated
-	public Response<List<Event>> eventList(String event, QueryParams queryParams);
+	Response<List<Event>> eventList(String event, QueryParams queryParams);
 
-	public Response<List<Event>> eventList(EventListRequest eventListRequest);
+	Response<List<Event>> eventList(EventListRequest eventListRequest);
 
 }
diff --git a/src/main/java/com/ecwid/consul/v1/health/HealthClient.java b/src/main/java/com/ecwid/consul/v1/health/HealthClient.java
index 9d964621..ff73881b 100644
--- a/src/main/java/com/ecwid/consul/v1/health/HealthClient.java
+++ b/src/main/java/com/ecwid/consul/v1/health/HealthClient.java
@@ -12,7 +12,7 @@
  */
 public interface HealthClient {
 
-	public Response<List<Check>> getHealthChecksForNode(String nodeName, QueryParams queryParams);
+	Response<List<Check>> getHealthChecksForNode(String nodeName, QueryParams queryParams);
 
 	// -------------------------------------------------------------------------------
 
@@ -20,9 +20,9 @@ public interface HealthClient {
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getHealthChecksForService(String serviceName, HealthChecksForServiceRequest healthChecksForServiceRequest)}
 	 */
 	@Deprecated
-	public Response<List<Check>> getHealthChecksForService(String serviceName, QueryParams queryParams);
+	Response<List<Check>> getHealthChecksForService(String serviceName, QueryParams queryParams);
 
-	public Response<List<Check>> getHealthChecksForService(String serviceName, HealthChecksForServiceRequest healthChecksForServiceRequest);
+	Response<List<Check>> getHealthChecksForService(String serviceName, HealthChecksForServiceRequest healthChecksForServiceRequest);
 
 	// -------------------------------------------------------------------------------
 
@@ -30,37 +30,37 @@ public interface HealthClient {
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getHealthServices(String serviceName, HealthServicesRequest healthServicesRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, boolean onlyPassing, QueryParams queryParams);
+	Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, boolean onlyPassing, QueryParams queryParams);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getHealthServices(String serviceName, HealthServicesRequest healthServicesRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, String tag, boolean onlyPassing, QueryParams queryParams);
+	Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, String tag, boolean onlyPassing, QueryParams queryParams);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getHealthServices(String serviceName, HealthServicesRequest healthServicesRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, boolean onlyPassing, QueryParams queryParams, String token);
+	Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, boolean onlyPassing, QueryParams queryParams, String token);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getHealthServices(String serviceName, HealthServicesRequest healthServicesRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, String tag, boolean onlyPassing, QueryParams queryParams, String token);
+	Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, String tag, boolean onlyPassing, QueryParams queryParams, String token);
 
 	/**
 	 * @deprecated This method will be removed in consul-api 2.0. Use {@link #getHealthServices(String serviceName, HealthServicesRequest healthServicesRequest)}
 	 */
 	@Deprecated
-	public Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, String[] tags, boolean onlyPassing, QueryParams queryParams, String token);
+	Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, String[] tags, boolean onlyPassing, QueryParams queryParams, String token);
 
-	public Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, HealthServicesRequest healthServicesRequest);
+	Response<List<com.ecwid.consul.v1.health.model.HealthService>> getHealthServices(String serviceName, HealthServicesRequest healthServicesRequest);
 
 	// -------------------------------------------------------------------------------
 
-	public Response<List<Check>> getHealthChecksState(QueryParams queryParams);
+	Response<List<Check>> getHealthChecksState(QueryParams queryParams);
 
-	public Response<List<Check>> getHealthChecksState(Check.CheckStatus checkStatus, QueryParams queryParams);
+	Response<List<Check>> getHealthChecksState(Check.CheckStatus checkStatus, QueryParams queryParams);
 }
diff --git a/src/main/java/com/ecwid/consul/v1/kv/KeyValueClient.java b/src/main/java/com/ecwid/consul/v1/kv/KeyValueClient.java
index 74ab1757..62403612 100644
--- a/src/main/java/com/ecwid/consul/v1/kv/KeyValueClient.java
+++ b/src/main/java/com/ecwid/consul/v1/kv/KeyValueClient.java
@@ -13,92 +13,92 @@
  */
 public interface KeyValueClient {
 
-	public Response<GetValue> getKVValue(String key);
+	Response<GetValue> getKVValue(String key);
 
-	public Response<GetValue> getKVValue(String key, String token);
+	Response<GetValue> getKVValue(String key, String token);
 
-	public Response<GetValue> getKVValue(String key, QueryParams queryParams);
+	Response<GetValue> getKVValue(String key, QueryParams queryParams);
 
-	public Response<GetValue> getKVValue(String key, String token, QueryParams queryParams);
+	Response<GetValue> getKVValue(String key, String token, QueryParams queryParams);
 
 
-	public Response<GetBinaryValue> getKVBinaryValue(String key);
+	Response<GetBinaryValue> getKVBinaryValue(String key);
 
-	public Response<GetBinaryValue> getKVBinaryValue(String key, String token);
+	Response<GetBinaryValue> getKVBinaryValue(String key, String token);
 
-	public Response<GetBinaryValue> getKVBinaryValue(String key, QueryParams queryParams);
+	Response<GetBinaryValue> getKVBinaryValue(String key, QueryParams queryParams);
 
-	public Response<GetBinaryValue> getKVBinaryValue(String key, String token, QueryParams queryParams);
+	Response<GetBinaryValue> getKVBinaryValue(String key, String token, QueryParams queryParams);
 
 
-	public Response<List<GetValue>> getKVValues(String keyPrefix);
+	Response<List<GetValue>> getKVValues(String keyPrefix);
 
-	public Response<List<GetValue>> getKVValues(String keyPrefix, String token);
+	Response<List<GetValue>> getKVValues(String keyPrefix, String token);
 
-	public Response<List<GetValue>> getKVValues(String keyPrefix, QueryParams queryParams);
+	Response<List<GetValue>> getKVValues(String keyPrefix, QueryParams queryParams);
 
-	public Response<List<GetValue>> getKVValues(String keyPrefix, String token, QueryParams queryParams);
+	Response<List<GetValue>> getKVValues(String keyPrefix, String token, QueryParams queryParams);
 
 
-	public Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix);
+	Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix);
 
-	public Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix, String token);
+	Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix, String token);
 
-	public Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix, QueryParams queryParams);
+	Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix, QueryParams queryParams);
 
-	public Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix, String token, QueryParams queryParams);
+	Response<List<GetBinaryValue>> getKVBinaryValues(String keyPrefix, String token, QueryParams queryParams);
 
 
-	public Response<List<String>> getKVKeysOnly(String keyPrefix);
+	Response<List<String>> getKVKeysOnly(String keyPrefix);
 
-	public Response<List<String>> getKVKeysOnly(String keyPrefix, String separator, String token);
+	Response<List<String>> getKVKeysOnly(String keyPrefix, String separator, String token);
 
-	public Response<List<String>> getKVKeysOnly(String keyPrefix, QueryParams queryParams);
+	Response<List<String>> getKVKeysOnly(String keyPrefix, QueryParams queryParams);
 
-	public Response<List<String>> getKVKeysOnly(String keyPrefix, String separator, String token, QueryParams queryParams);
+	Response<List<String>> getKVKeysOnly(String keyPrefix, String separator, String token, QueryParams queryParams);
 
 
-	public Response<Boolean> setKVValue(String key, String value);
+	Response<Boolean> setKVValue(String key, String value);
 
-	public Response<Boolean> setKVValue(String key, String value, PutParams putParams);
+	Response<Boolean> setKVValue(String key, String value, PutParams putParams);
 
-	public Response<Boolean> setKVValue(String key, String value, String token, PutParams putParams);
+	Response<Boolean> setKVValue(String key, String value, String token, PutParams putParams);
 
-	public Response<Boolean> setKVValue(String key, String value, QueryParams queryParams);
+	Response<Boolean> setKVValue(String key, String value, QueryParams queryParams);
 
-	public Response<Boolean> setKVValue(String key, String value, PutParams putParams, QueryParams queryParams);
+	Response<Boolean> setKVValue(String key, String value, PutParams putParams, QueryParams queryParams);
 
-	public Response<Boolean> setKVValue(String key, String value, String token, PutParams putParams, QueryParams queryParams);
+	Response<Boolean> setKVValue(String key, String value, String token, PutParams putParams, QueryParams queryParams);
 
 
-	public Response<Boolean> setKVBinaryValue(String key, byte[] value);
+	Response<Boolean> setKVBinaryValue(String key, byte[] value);
 
-	public Response<Boolean> setKVBinaryValue(String key, byte[] value, PutParams putParams);
+	Response<Boolean> setKVBinaryValue(String key, byte[] value, PutParams putParams);
 
-	public Response<Boolean> setKVBinaryValue(String key, byte[] value, String token, PutParams putParams);
+	Response<Boolean> setKVBinaryValue(String key, byte[] value, String token, PutParams putParams);
 
-	public Response<Boolean> setKVBinaryValue(String key, byte[] value, QueryParams queryParams);
+	Response<Boolean> setKVBinaryValue(String key, byte[] value, QueryParams queryParams);
 
-	public Response<Boolean> setKVBinaryValue(String key, byte[] value, PutParams putParams, QueryParams queryParams);
+	Response<Boolean> setKVBinaryValue(String key, byte[] value, PutParams putParams, QueryParams queryParams);
 
-	public Response<Boolean> setKVBinaryValue(String key, byte[] value, String token, PutParams putParams, QueryParams queryParams);
+	Response<Boolean> setKVBinaryValue(String key, byte[] value, String token, PutParams putParams, QueryParams queryParams);
 
 
-	public Response<Void> deleteKVValue(String key);
+	Response<Void> deleteKVValue(String key);
 
-	public Response<Void> deleteKVValue(String key, String token);
+	Response<Void> deleteKVValue(String key, String token);
 
-	public Response<Void> deleteKVValue(String key, QueryParams queryParams);
+	Response<Void> deleteKVValue(String key, QueryParams queryParams);
 
-	public Response<Void> deleteKVValue(String key, String token, QueryParams queryParams);
+	Response<Void> deleteKVValue(String key, String token, QueryParams queryParams);
 
 
-	public Response<Void> deleteKVValues(String key);
+	Response<Void> deleteKVValues(String key);
 
-	public Response<Void> deleteKVValues(String key, String token);
+	Response<Void> deleteKVValues(String key, String token);
 
-	public Response<Void> deleteKVValues(String key, QueryParams queryParams);
+	Response<Void> deleteKVValues(String key, QueryParams queryParams);
 
-	public Response<Void> deleteKVValues(String key, String token, QueryParams queryParams);
+	Response<Void> deleteKVValues(String key, String token, QueryParams queryParams);
 
 }
diff --git a/src/main/java/com/ecwid/consul/v1/query/QueryClient.java b/src/main/java/com/ecwid/consul/v1/query/QueryClient.java
index d0985d3b..4495c51e 100644
--- a/src/main/java/com/ecwid/consul/v1/query/QueryClient.java
+++ b/src/main/java/com/ecwid/consul/v1/query/QueryClient.java
@@ -6,5 +6,5 @@
 
 public interface QueryClient {
 
-	public Response<QueryExecution> executePreparedQuery(String uuid, QueryParams queryParams);
+	Response<QueryExecution> executePreparedQuery(String uuid, QueryParams queryParams);
 }
diff --git a/src/main/java/com/ecwid/consul/v1/session/SessionClient.java b/src/main/java/com/ecwid/consul/v1/session/SessionClient.java
index 589a0a66..359f921e 100644
--- a/src/main/java/com/ecwid/consul/v1/session/SessionClient.java
+++ b/src/main/java/com/ecwid/consul/v1/session/SessionClient.java
@@ -12,13 +12,13 @@
  */
 public interface SessionClient {
 
-	public Response<String> sessionCreate(NewSession newSession, QueryParams queryParams);
+	Response<String> sessionCreate(NewSession newSession, QueryParams queryParams);
 
-	public Response<String> sessionCreate(NewSession newSession, QueryParams queryParams, String token);
+	Response<String> sessionCreate(NewSession newSession, QueryParams queryParams, String token);
 
-	public Response<Void> sessionDestroy(String session, QueryParams queryParams);
+	Response<Void> sessionDestroy(String session, QueryParams queryParams);
 
-	public Response<Void> sessionDestroy(String session, QueryParams queryParams, String token);
+	Response<Void> sessionDestroy(String session, QueryParams queryParams, String token);
 
 	Response<Session> getSessionInfo(String session, QueryParams queryParams);