diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/AbstractCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/AbstractCassandraConverter.java
index 9943bcd87..bfcc255ff 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/AbstractCassandraConverter.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/AbstractCassandraConverter.java
@@ -22,10 +22,11 @@ import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.convert.EntityInstantiators;
 
 /**
- * Base class for {@link CassandraConverter} implementations. Sets up a {@link GenericConversionService} and
- * populates basic converters.
+ * Base class for {@link CassandraConverter} implementations. Sets up a {@link GenericConversionService} and populates
+ * basic converters.
  * 
  * @author Alex Shvid
+ * @author Matthew T. Adams
  */
 public abstract class AbstractCassandraConverter implements CassandraConverter, InitializingBean {
 
@@ -50,18 +51,12 @@ public abstract class AbstractCassandraConverter implements CassandraConverter,
 		this.instantiators = instantiators == null ? new EntityInstantiators() : instantiators;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.convert.MongoConverter#getConversionService()
-	 */
+	@Override
 	public ConversionService getConversionService() {
 		return conversionService;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
+	@Override
 	public void afterPropertiesSet() {
 	}
-
 }
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
index 293bfe773..d8d7e5127 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
@@ -133,14 +133,14 @@ public class MappingCassandraConverter extends AbstractCassandraConverter implem
 
 			public void doWithPersistentProperty(CassandraPersistentProperty prop) {
 
-				MappingCassandraConverter.this.handlePropertyRead(row, entity, prop, propertyProvider, wrapper);
+				MappingCassandraConverter.this.handlePersistentPropertyRead(row, entity, prop, propertyProvider, wrapper);
 			}
 		});
 
 		return result;
 	}
 
-	protected void handlePropertyRead(final Row row, final CassandraPersistentEntity<?> entity,
+	protected void handlePersistentPropertyRead(final Row row, final CassandraPersistentEntity<?> entity,
 			final CassandraPersistentProperty prop,
 			final PropertyValueProvider<CassandraPersistentProperty> propertyProvider, final BeanWrapper<?, ?> wrapper) {
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/RowReaderPropertyAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/RowReaderPropertyAccessor.java
index 020b6afd2..65434e4d5 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/RowReaderPropertyAccessor.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/RowReaderPropertyAccessor.java
@@ -33,26 +33,17 @@ enum RowReaderPropertyAccessor implements PropertyAccessor {
 
 	INSTANCE;
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#getSpecificTargetClasses()
-	 */
+	@Override
 	public Class<?>[] getSpecificTargetClasses() {
 		return new Class<?>[] { Row.class };
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#canRead(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
+	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) {
 		return ((Row) target).getColumnDefinitions().contains(name);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#read(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
+	@Override
 	public TypedValue read(EvaluationContext context, Object target, String name) {
 		Row row = (Row) target;
 		if (row.isNull(name)) {
@@ -64,20 +55,13 @@ enum RowReaderPropertyAccessor implements PropertyAccessor {
 		return new TypedValue(object);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#canWrite(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
+	@Override
 	public boolean canWrite(EvaluationContext context, Object target, String name) {
 		return false;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#write(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
+	@Override
 	public void write(EvaluationContext context, Object target, String name, Object newValue) {
 		throw new UnsupportedOperationException();
 	}
-
 }