diff --git a/src/main/java/com/laytonsmith/core/constructs/CFunction.java b/src/main/java/com/laytonsmith/core/constructs/CFunction.java
index de08abd056..e42570c9d3 100644
--- a/src/main/java/com/laytonsmith/core/constructs/CFunction.java
+++ b/src/main/java/com/laytonsmith/core/constructs/CFunction.java
@@ -100,7 +100,7 @@ public static boolean CanDryEval(ParseTree data) {
 			} else {
 				return false;
 			}
-		} catch(ConfigCompileException ex) {
+		} catch (ConfigCompileException ex) {
 			return false;
 		}
 	}
diff --git a/src/main/java/com/laytonsmith/core/objects/Element.java b/src/main/java/com/laytonsmith/core/objects/Element.java
index ddeb36d622..5f6845536f 100644
--- a/src/main/java/com/laytonsmith/core/objects/Element.java
+++ b/src/main/java/com/laytonsmith/core/objects/Element.java
@@ -113,6 +113,7 @@ public boolean isNativeField() {
 	 * The access modifier of the element.
 	 * @return
 	 */
+	@Override
 	public AccessModifier getAccessModifier() {
 		return accessModifier;
 	}
@@ -159,6 +160,7 @@ public String getElementName() {
 		return name;
 	}
 
+	@Override
 	public Target getTarget() {
 		return t;
 	}
diff --git a/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java b/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java
index ebe0c85baf..d019348e34 100644
--- a/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java
+++ b/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java
@@ -9,7 +9,6 @@
 import com.laytonsmith.core.constructs.CNull;
 import com.laytonsmith.core.constructs.Construct;
 import com.laytonsmith.core.constructs.Target;
-import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.natives.interfaces.Mixed;
 import java.lang.reflect.Field;
 import java.util.Objects;
@@ -135,6 +134,7 @@ public boolean isNativeField() {
 	 * The access modifier of the element.
 	 * @return
 	 */
+	@Override
 	public AccessModifier getAccessModifier() {
 		return accessModifier;
 	}
@@ -174,6 +174,7 @@ public String getElementName() {
 		return name;
 	}
 
+	@Override
 	public Target getTarget() {
 		return t;
 	}
diff --git a/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java b/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java
index 2a053a1a4a..fe0c6253f9 100644
--- a/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java
+++ b/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java
@@ -20,7 +20,6 @@
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Set;