diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java
index da9c4ef7..690f6d32 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java
@@ -97,6 +97,9 @@ public class AwsEc2AuthenticationOptions {
 		return role;
 	}
 
+	/**
+	 * Builder for {@link AwsEc2AuthenticationOptionsBuilder}.
+	 */
 	public static class AwsEc2AuthenticationOptionsBuilder {
 
 		private String path = DEFAULT_AWS_AUTHENTICATION_PATH;
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClient.java b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClient.java
index 4c2d743c..3894e883 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClient.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClient.java
@@ -181,8 +181,7 @@ public class VaultClient extends VaultAccessor {
 
 	/**
 	 * Execute the HTTP method to the given URI template, writing the given request entity to the request, and returns the
-	 * response as {@link VaultResponseEntity}.
-	 * URI Template variables are using the given URI variables, if any.
+	 * response as {@link VaultResponseEntity}. URI Template variables are using the given URI variables, if any.
 	 *
 	 * @param pathTemplate the path template.
 	 * @param method the HTTP method (GET, POST, etc).
@@ -281,6 +280,7 @@ public class VaultClient extends VaultAccessor {
 
 	/**
 	 * Unwrap a wrapped response created by Vault Response Wrapping
+	 * 
 	 * @param wrappedResponse the wrapped response , must not be empty or {@literal null}.
 	 * @param responseType the type of the return value.
 	 * @return the unwrapped response.
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java
index 3169dfb0..85f36837 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java
@@ -15,8 +15,8 @@
  */
 package org.springframework.vault.core;
 
-import org.springframework.vault.support.VaultTransitKeyConfiguration;
 import org.springframework.vault.support.VaultTransitKey;
+import org.springframework.vault.support.VaultTransitKeyConfiguration;
 import org.springframework.vault.support.VaultTransitKeyCreationRequest;
 import org.springframework.vault.support.VaultTransitRequest;
 
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java
index dbcdc3ef..b013be64 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java
@@ -20,9 +20,9 @@ import java.util.Map;
 
 import org.springframework.util.Assert;
 import org.springframework.util.Base64Utils;
-import org.springframework.vault.support.VaultTransitKeyConfiguration;
 import org.springframework.vault.support.VaultResponseSupport;
 import org.springframework.vault.support.VaultTransitKey;
+import org.springframework.vault.support.VaultTransitKeyConfiguration;
 import org.springframework.vault.support.VaultTransitKeyCreationRequest;
 import org.springframework.vault.support.VaultTransitRequest;
 
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/core/package-info.java
index 66dd4d85..a2f01e54 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/core/package-info.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/core/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Vault core support.
  */
-package org.springframework.vault.core;
\ No newline at end of file
+package org.springframework.vault.core;
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/package-info.java
index d3ce5712..ac68ed7f 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/package-info.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/package-info.java
@@ -2,4 +2,3 @@
  * Spring support for <a href="https://vaultproject.io">Hashicorp Vault</a>.
  */
 package org.springframework.vault;
-