diff --git a/labs/todojse/src/main/java/com/redhat/training/TestTodoMap.java b/labs/todojse/src/main/java/com/redhat/training/TestTodoMap.java
index f96ab4a..9fba584 100644
--- a/labs/todojse/src/main/java/com/redhat/training/TestTodoMap.java
+++ b/labs/todojse/src/main/java/com/redhat/training/TestTodoMap.java
@@ -41,14 +41,14 @@ public static boolean executeMenu(BufferedReader in, TodoMap todo) throws IOExce
 		// Display an todo record
 		case 'R':
 			System.out.println("Enter int value for item id: ");
-			id = new Integer(in.readLine().trim());
+			id = Integer.valueOf(in.readLine().trim());
 			todo.findItemTodo(id);
 			break;
 
 		// Mark an existing task as completed
 		case 'C':
 			System.out.println("Enter int value for item id: ");
-			id = new Integer(in.readLine().trim());
+			id = Integer.valueOf(in.readLine().trim());
 			todo.completeTodo(id);
 			break;
 
@@ -56,7 +56,7 @@ public static boolean executeMenu(BufferedReader in, TodoMap todo) throws IOExce
 		// Delete an todo record
 		case 'D':
 			System.out.println("Enter int value for item id: ");
-			id = new Integer(in.readLine().trim());
+			id = Integer.valueOf(in.readLine().trim());
 			todo.deleteTodo(id);
 			System.out.println("Deleted item " + id);
 			break;
diff --git a/labs/todojse/src/main/java/com/redhat/training/TodoMap.java b/labs/todojse/src/main/java/com/redhat/training/TodoMap.java
index 9aa2eda..28b8964 100644
--- a/labs/todojse/src/main/java/com/redhat/training/TodoMap.java
+++ b/labs/todojse/src/main/java/com/redhat/training/TodoMap.java
@@ -34,7 +34,7 @@ public void addTodo() {
 				status = Status.PENDING.toString();
 
 			item.setStatus(status);
-			todoMap.put(new Integer(count), item);
+			todoMap.put(Integer.valueOf(count), item);
 			System.out.println("Do you want to add more items[Y/N]");
 			ans = scn.next().toUpperCase();