diff --git a/src/main/java/org/springframework/data/domain/ExampleMatcher.java b/src/main/java/org/springframework/data/domain/ExampleMatcher.java
index 8b4204d8d..28b7d41d5 100644
--- a/src/main/java/org/springframework/data/domain/ExampleMatcher.java
+++ b/src/main/java/org/springframework/data/domain/ExampleMatcher.java
@@ -487,7 +487,7 @@ public interface ExampleMatcher {
 		}
 
 		/**
-		 * Creates a {@link GenericPropertyMatcher} that matches string case sensitive.
+		 * Creates a {@link GenericPropertyMatcher} that matches string case-sensitive.
 		 *
 		 * @return
 		 */
diff --git a/src/main/java/org/springframework/data/domain/Sort.java b/src/main/java/org/springframework/data/domain/Sort.java
index b3926eb46..eb2f6317f 100644
--- a/src/main/java/org/springframework/data/domain/Sort.java
+++ b/src/main/java/org/springframework/data/domain/Sort.java
@@ -267,7 +267,7 @@ public class Sort implements Streamable<org.springframework.data.domain.Sort.Ord
 	 *
 	 * @author Oliver Gierke
 	 */
-	public static enum Direction {
+	public enum Direction {
 
 		ASC, DESC;
 
@@ -429,7 +429,7 @@ public class Sort implements Streamable<org.springframework.data.domain.Sort.Ord
 		 *
 		 * @param direction can be {@literal null}, will default to {@link Sort#DEFAULT_DIRECTION}
 		 * @param property must not be {@literal null} or empty.
-		 * @param ignoreCase true if sorting should be case insensitive. false if sorting should be case sensitive.
+		 * @param ignoreCase true if sorting should be case-insensitive. false if sorting should be case-sensitive.
 		 * @param nullHandling must not be {@literal null}.
 		 * @since 1.7
 		 */
@@ -483,7 +483,7 @@ public class Sort implements Streamable<org.springframework.data.domain.Sort.Ord
 		}
 
 		/**
-		 * Returns whether or not the sort will be case sensitive.
+		 * Returns whether the sort will be case-sensitive or case-insensitive.
 		 *
 		 * @return
 		 */
diff --git a/src/test/java/org/springframework/data/domain/SortUnitTests.java b/src/test/java/org/springframework/data/domain/SortUnitTests.java
index da842aef6..90c1ad7dc 100755
--- a/src/test/java/org/springframework/data/domain/SortUnitTests.java
+++ b/src/test/java/org/springframework/data/domain/SortUnitTests.java
@@ -40,8 +40,6 @@ class SortUnitTests {
 
 	/**
 	 * Asserts that the class applies the default sort order if no order or {@code null} was provided.
-	 *
-	 * @throws Exception
 	 */
 	@Test
 	void appliesDefaultForOrder() {
@@ -50,8 +48,6 @@ class SortUnitTests {
 
 	/**
 	 * Asserts that the class rejects {@code null} as properties array.
-	 *
-	 * @throws Exception
 	 */
 	@Test
 	@SuppressWarnings("null")
@@ -61,8 +57,6 @@ class SortUnitTests {
 
 	/**
 	 * Asserts that the class rejects {@code null} values in the properties array.
-	 *
-	 * @throws Exception
 	 */
 	@Test
 	void preventsNullProperty() {
@@ -71,8 +65,6 @@ class SortUnitTests {
 
 	/**
 	 * Asserts that the class rejects empty strings in the properties array.
-	 *
-	 * @throws Exception
 	 */
 	@Test
 	void preventsEmptyProperty() {
@@ -81,8 +73,6 @@ class SortUnitTests {
 
 	/**
 	 * Asserts that the class rejects no properties given at all.
-	 *
-	 * @throws Exception
 	 */
 	@Test
 	void preventsNoProperties() {