diff --git a/src/main/java/seedu/taskman/logic/commands/CompleteCommand.java b/src/main/java/seedu/taskman/logic/commands/CompleteCommand.java
index 1433bf325e77..8e0e8db6523d 100644
--- a/src/main/java/seedu/taskman/logic/commands/CompleteCommand.java
+++ b/src/main/java/seedu/taskman/logic/commands/CompleteCommand.java
@@ -59,7 +59,7 @@ public CommandResult execute() {
 	                    activityToComplete.getSchedule().get(),
 	                    activityToComplete.getFrequency().get());
 	        	try {
-					task.status = new Status(STATUS_COMPLETE);
+					task.setStatus(new Status(STATUS_COMPLETE));
 				} catch (IllegalValueException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
diff --git a/src/main/java/seedu/taskman/logic/commands/EditCommand.java b/src/main/java/seedu/taskman/logic/commands/EditCommand.java
index 1cc443438d5a..a305cfb64fef 100644
--- a/src/main/java/seedu/taskman/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/taskman/logic/commands/EditCommand.java
@@ -26,7 +26,7 @@ public class EditCommand extends Command {
     public static final String MESSAGE_SUCCESS = "Task updated: %1$s";
     public static final String MESSAGE_DUPLICATE_TASK = "A task with the same name already exists in TaskMan";
 
-    protected final ArgumentContainer argsContainer;
+    private final ArgumentContainer argsContainer;
     private Activity beforeEdit;
     private Activity afterEdit;
     private Activity.ActivityType activityType;
@@ -123,7 +123,7 @@ private void initMembers(ArgumentContainer argsContainer) throws IllegalValueExc
         }
     }
 
-    protected static class ArgumentContainer {
+    private static class ArgumentContainer {
         public final int targetIndex;
         public String title;
         public String deadline;
diff --git a/src/main/java/seedu/taskman/model/TaskMan.java b/src/main/java/seedu/taskman/model/TaskMan.java
index ab75d58b5dab..192bc08234a7 100644
--- a/src/main/java/seedu/taskman/model/TaskMan.java
+++ b/src/main/java/seedu/taskman/model/TaskMan.java
@@ -149,7 +149,7 @@ public boolean completeActivity(Activity key) throws UniqueActivityList.Activity
        			key.getSchedule().get(),
        			key.getFrequency().get()
        			);
-        	task.status = new Status("complete");
+        	task.setStatus(new Status("complete"));
 			this.addActivity(new Activity(task));
             return true;
         } else {
diff --git a/src/main/java/seedu/taskman/model/event/Task.java b/src/main/java/seedu/taskman/model/event/Task.java
index 60664ba37127..00e46060c13b 100644
--- a/src/main/java/seedu/taskman/model/event/Task.java
+++ b/src/main/java/seedu/taskman/model/event/Task.java
@@ -14,7 +14,7 @@
 public class Task extends Event implements ReadOnlyTask, MutableTagsEvent {
 
     private Deadline deadline;
-    public Status status;
+    private Status status;
 
     public Task(@Nonnull Title title, @Nonnull UniqueTagList tags,
                 @Nullable Deadline deadline,