diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeBin.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeBin.java
index a3cc408..95ecb3c 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeBin.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeBin.java
@@ -13,7 +13,6 @@
 public @interface AerospikeBin {
 	/**
 	 * The name of the bin to use. If not specified, the field name is used for the bin name.
-	 * @return
 	 */
 	String name() default "";
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeEmbed.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeEmbed.java
index 32ba4f5..d5e68c1 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeEmbed.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeEmbed.java
@@ -5,17 +5,19 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
 /**
- * Bins marked with AerospikeExclude will not be mapped to the database, irrespective of other annotations. 
+ * Bins marked with AerospikeExclude will not be mapped to the database, irrespective of other annotations.
  */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
 public @interface AerospikeEmbed {
-	public static enum EmbedType {
+
+	enum EmbedType {
 		LIST,
 		MAP,
 		DEFAULT
 	}
+
 	EmbedType type() default EmbedType.DEFAULT;
 	/**
 	 * The elementType is used for sub-elements. For example, if there is:
@@ -25,8 +27,6 @@ public static enum EmbedType {
 	 * private List<Account> accounts;
 	 * </pre>
 	 * then the objects will be stored in the database as lists of lists, rather than lists of maps.
-	 * 
-	 * @return
 	 */
 	EmbedType elementType() default EmbedType.DEFAULT;
 	
@@ -79,7 +79,6 @@ public static enum EmbedType {
 	 * <pre>
 	 * KEY_ORDERED_MAP('{99:["details2", 99, 200], 101:["details1", 101, 100], 1010:["details3", 1010, 300]}')
 	 * </pre>
-	 * @return
 	 */
 	boolean saveKey() default false;
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeExclude.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeExclude.java
index c79208d..b5b624c 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeExclude.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeExclude.java
@@ -5,10 +5,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
 /**
- * Bins marked with AerospikeExclude will not be mapped to the database, irrespective of other annotations. 
+ * Bins marked with AerospikeExclude will not be mapped to the database, irrespective of other annotations.
  */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
 public @interface AerospikeExclude {
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeGetter.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeGetter.java
index d4bd7cf..032db99 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeGetter.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeGetter.java
@@ -13,7 +13,6 @@
 public @interface AerospikeGetter {
 	/**
 	 * The name of the bin to use.
-	 * @return
 	 */
 	String name();
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeKey.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeKey.java
index 4b3f75a..0fd0f11 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeKey.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeKey.java
@@ -8,6 +8,8 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD})
 public @interface AerospikeKey {
-	/** The setter attribute is used only on Methods where the method is used to set the key on lazy object instantiation */
-	public boolean setter() default false;
+	/**
+	 * The setter attribute is used only on Methods where the method is used to set the key on lazy object instantiation
+	 */
+	boolean setter() default false;
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeOrdinal.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeOrdinal.java
index da4d8a1..4467fb9 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeOrdinal.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeOrdinal.java
@@ -8,5 +8,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD})
 public @interface AerospikeOrdinal {
-	public int value() default 1;
+	int value() default 1;
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeRecord.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeRecord.java
index 4d9ec3e..8cd5625 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeRecord.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeRecord.java
@@ -15,7 +15,6 @@
 	int ttl() default 0;
 	/**
 	 * Determine whether to add all the bins or not. If true, all bins will be added without having to map them via @AerospikeBin
-	 * @return
 	 */
 	boolean mapAll() default true;
 	int version() default 1;
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeReference.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeReference.java
index 81cae1f..f549424 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeReference.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeReference.java
@@ -5,29 +5,27 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
 /**
- * Bins marked with AerospikeExclude will not be mapped to the database, irrespective of other annotations. 
+ * Bins marked with AerospikeExclude will not be mapped to the database, irrespective of other annotations.
  */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
 public @interface AerospikeReference {
 	/**
 	 * Fields marked as being lazy references will not be read from Aerospike at runtime when the parent class is
 	 * read. Instead, a new object with just the key populated will be created
-	 * @return
 	 */
 	boolean lazy() default false;
 	/**
 	 * When a reference is to be loaded, it can either be loaded inline or it can be loaded via a batch load. The
 	 * batch load is typically significantly more efficient. Set this flag to <pre>false</pre> to prevent the batch load
-	 * @return
 	 */
 	boolean batchLoad() default true;
 	
-	public static enum ReferenceType {
+	enum ReferenceType {
 		ID,
 		DIGEST
 	}
-	ReferenceType type() default ReferenceType.ID;
 
+	ReferenceType type() default ReferenceType.ID;
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/AerospikeSetter.java b/src/main/java/com/aerospike/mapper/annotations/AerospikeSetter.java
index d534988..740a89e 100644
--- a/src/main/java/com/aerospike/mapper/annotations/AerospikeSetter.java
+++ b/src/main/java/com/aerospike/mapper/annotations/AerospikeSetter.java
@@ -13,7 +13,6 @@
 public @interface AerospikeSetter {
 	/**
 	 * The name of the bin to use.
-	 * @return
 	 */
 	String name();
 }
diff --git a/src/main/java/com/aerospike/mapper/annotations/ParamFrom.java b/src/main/java/com/aerospike/mapper/annotations/ParamFrom.java
index d9c778f..546adf6 100644
--- a/src/main/java/com/aerospike/mapper/annotations/ParamFrom.java
+++ b/src/main/java/com/aerospike/mapper/annotations/ParamFrom.java
@@ -13,7 +13,6 @@
 public @interface ParamFrom {
 	/**
 	 * The name of the bin to use.
-	 * @return
 	 */
 	String value();
 }