diff --git a/interpreter/src/main/java/com/iluwatar/App.java b/interpreter/src/main/java/com/iluwatar/App.java
index 0471f34a8..94bbc4466 100644
--- a/interpreter/src/main/java/com/iluwatar/App.java
+++ b/interpreter/src/main/java/com/iluwatar/App.java
@@ -50,11 +50,7 @@ public class App {
 	}
 
 	public static boolean isOperator(String s) {
-		if (s.equals("+") || s.equals("-") || s.equals("*")) {
-			return true;
-		} else {
-			return false;
-		}
+		return s.equals("+") || s.equals("-") || s.equals("*");
 	}
 
 	public static Expression getOperatorInstance(String s, Expression left,
diff --git a/mediator/src/main/java/com/iluwatar/Action.java b/mediator/src/main/java/com/iluwatar/Action.java
index 25f568e12..cbe6f60c9 100644
--- a/mediator/src/main/java/com/iluwatar/Action.java
+++ b/mediator/src/main/java/com/iluwatar/Action.java
@@ -6,23 +6,16 @@ public enum Action {
 
 	public String toString() {
 
-		String s = "";
 		switch (this) {
 		case ENEMY:
-			s = "spotted enemies";
-			break;
+			return "spotted enemies";
 		case GOLD:
-			s = "found gold";
-			break;
+			return "found gold";
 		case HUNT:
-			s = "hunted a rabbit";
-			break;
+			return "hunted a rabbit";
 		case TALE:
-			s = "tells a tale";
-			break;
-		default:
-			break;
+			return "tells a tale";
 		}
-		return s;
-	};
+		return "";
+	}
 }
diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java b/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java
index ec4d095da..c36dca612 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java
@@ -29,17 +29,17 @@ public class FileLoader {
 		try {
 			BufferedReader br = new BufferedReader(new FileReader(new File(
 					this.fileName)));
-			String text = "";
-			String line = "";
+			StringBuilder sb = new StringBuilder();
+			String line;
 
 			while ((line = br.readLine()) != null) {
-				text += line + "\n";
+				sb.append(line).append('\n');
 			}
 
 			this.loaded = true;
 			br.close();
 
-			return text;
+			return sb.toString();
 		}
 
 		catch (Exception e) {