diff --git a/src/main/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiator.java b/src/main/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiator.java
index 352f757e4..506ffd40b 100644
--- a/src/main/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiator.java
+++ b/src/main/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiator.java
@@ -29,16 +29,17 @@ import org.springframework.data.mapping.model.ParameterValueProvider;
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @since 1.10
- * @deprecated since 1.11 in favor of {@link ClassGeneratingEntityInstantiator}
+ * @deprecated since 1.11 in favor of {@link ClassGeneratingEntityInstantiator}.
  */
+@Deprecated
 public enum BytecodeGeneratingEntityInstantiator implements EntityInstantiator {
 
 	INSTANCE;
 
 	private final ClassGeneratingEntityInstantiator delegate = new ClassGeneratingEntityInstantiator();
 
-
-	/* (non-Javadoc)
+	/* 
+	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.EntityInstantiator#createInstance(org.springframework.data.mapping.PersistentEntity, org.springframework.data.mapping.model.ParameterValueProvider)
 	 */
 	@Override
diff --git a/src/main/java/org/springframework/data/convert/ClassGeneratingEntityInstantiator.java b/src/main/java/org/springframework/data/convert/ClassGeneratingEntityInstantiator.java
index 1aaa12e23..414b45a90 100644
--- a/src/main/java/org/springframework/data/convert/ClassGeneratingEntityInstantiator.java
+++ b/src/main/java/org/springframework/data/convert/ClassGeneratingEntityInstantiator.java
@@ -1,4 +1,3 @@
-package org.springframework.data.convert;
 /*
  * Copyright 2015 the original author or authors.
  *
@@ -14,6 +13,7 @@ package org.springframework.data.convert;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.springframework.data.convert;
 
 import static org.springframework.asm.Opcodes.*;
 
@@ -49,7 +49,8 @@ import org.springframework.util.ClassUtils;
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
- * @since 1.10
+ * @author Phillip Webb
+ * @since 1.11
  */
 public class ClassGeneratingEntityInstantiator implements EntityInstantiator {
 
@@ -58,11 +59,15 @@ public class ClassGeneratingEntityInstantiator implements EntityInstantiator {
 	private volatile Map<TypeInformation<?>, EntityInstantiator> entityInstantiators = new HashMap<TypeInformation<?>, EntityInstantiator>(
 			32);
 
+	/**
+	 * Creates a new {@link ClassGeneratingEntityInstantiator}.
+	 */
 	public ClassGeneratingEntityInstantiator() {
 		this.generator = new ObjectInstantiatorClassGenerator();
 	}
 
-	/* (non-Javadoc)
+	/* 
+	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.EntityInstantiator#createInstance(org.springframework.data.mapping.PersistentEntity, org.springframework.data.mapping.model.ParameterValueProvider)
 	 */
 	@Override
diff --git a/src/main/java/org/springframework/data/convert/EntityInstantiators.java b/src/main/java/org/springframework/data/convert/EntityInstantiators.java
index 94b1d0413..77cad6453 100644
--- a/src/main/java/org/springframework/data/convert/EntityInstantiators.java
+++ b/src/main/java/org/springframework/data/convert/EntityInstantiators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiatorUnitTests.java b/src/test/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiatorUnitTests.java
index b4a10f835..7c0a3b277 100644
--- a/src/test/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiatorUnitTests.java
+++ b/src/test/java/org/springframework/data/convert/BytecodeGeneratingEntityInstantiatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/springframework/data/convert/EntityInstantiatorsUnitTests.java b/src/test/java/org/springframework/data/convert/EntityInstantiatorsUnitTests.java
index 64f278bee..429a00b9a 100644
--- a/src/test/java/org/springframework/data/convert/EntityInstantiatorsUnitTests.java
+++ b/src/test/java/org/springframework/data/convert/EntityInstantiatorsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.