Cleanup

1 files changed, 20 insertions, 22 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Option.java b/BJC-Utils2/src/main/java/bjc/utils/data/Option.java
index fa25b54..718ab6e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Option.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Option.java
@@ -26,28 +26,30 @@ public class Option<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public <BoundType> IHolder<BoundType> bind(Function<ContainedType, IHolder<BoundType>> binder) {
-		if(held == null) return new Option<>(null);
+		if (held == null)
+			return new Option<>(null);
 
 		return binder.apply(held);
 	}
 
 	@Override
 	public <NewType> Function<ContainedType, IHolder<NewType>> lift(Function<ContainedType, NewType> func) {
-		return (val) -> {
+		return val -> {
 			return new Option<>(func.apply(val));
 		};
 	}
 
 	@Override
 	public <MappedType> IHolder<MappedType> map(Function<ContainedType, MappedType> mapper) {
-		if(held == null) return new Option<>(null);
+		if (held == null)
+			return new Option<>(null);
 
 		return new Option<>(mapper.apply(held));
 	}
 
 	@Override
 	public IHolder<ContainedType> transform(UnaryOperator<ContainedType> transformer) {
-		if(held != null) {
+		if (held != null) {
 			held = transformer.apply(held);
 		}
 
@@ -56,24 +58,15 @@ public class Option<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public <UnwrappedType> UnwrappedType unwrap(Function<ContainedType, UnwrappedType> unwrapper) {
-		if(held == null) return null;
+		if (held == null)
+			return null;
 
 		return unwrapper.apply(held);
 	}
 
 	@Override
 	public String toString() {
-		StringBuilder builder = new StringBuilder();
-
-		builder.append("Option [");
-
-		if(held != null) {
-			builder.append("held=");
-			builder.append(held);
-		}
-
-		builder.append("]");
-		return builder.toString();
+		return String.format("Option [held='%s']", held);
 	}
 
 	@Override
@@ -88,15 +81,20 @@ public class Option<ContainedType> implements IHolder<ContainedType> {
 
 	@Override
 	public boolean equals(Object obj) {
-		if(this == obj) return true;
-		if(obj == null) return false;
-		if(getClass() != obj.getClass()) return false;
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (!(obj instanceof Option<?>))
+			return false;
 
 		Option<?> other = (Option<?>) obj;
 
-		if(held == null) {
-			if(other.held != null) return false;
-		} else if(!held.equals(other.held)) return false;
+		if (held == null) {
+			if (other.held != null)
+				return false;
+		} else if (!held.equals(other.held))
+			return false;
 
 		return true;
 	}