diff --git a/deadlock-plugins/deadlock-extension/package.json b/deadlock-plugins/deadlock-extension/package.json
index acb460290121cc42bb73f8b76693923075fa9917..2d85cc6659fcd4390d37997a79ba8e59c7d855a6 100644
--- a/deadlock-plugins/deadlock-extension/package.json
+++ b/deadlock-plugins/deadlock-extension/package.json
@@ -133,6 +133,7 @@
     "webpack-dev-server": "^4.9.3"
   },
   "extensionPack": [
-    "ms-vscode-remote.remote-containers"
+    "ms-vscode-remote.remote-containers",
+    "eamodio.gitlens"
   ]
 }
diff --git a/deadlock-plugins/deadlock-extension/src/core/gitMission.ts b/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
index 6df20bee4a98ca79b07018ece4c064407895b064..794137e58b1e4dd0571f0632178edb778dd97ac4 100644
--- a/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
@@ -120,8 +120,8 @@ export default class GitMission {
     return this.git.add('.');
   }
 
-  commit(message: string, options?: string[]) {
-    return this.git.commit(message, options ?? []);
+  commit(message: string, options: string[] = []) {
+    return this.git.commit(message, options);
   }
 
   push() {
diff --git a/deadlock-plugins/deadlock-extension/src/recorder/recorder.ts b/deadlock-plugins/deadlock-extension/src/recorder/recorder.ts
index fd9220d6edc3ceed743776aeae3589dab9f17c45..0eaa8e4716a2acc57e019fbc095f4a0956ab7a5e 100644
--- a/deadlock-plugins/deadlock-extension/src/recorder/recorder.ts
+++ b/deadlock-plugins/deadlock-extension/src/recorder/recorder.ts
@@ -33,29 +33,33 @@ export default class Recorder {
   }
 
   async setupProject(gitMission: GitMission) {
+    const argsArray: string[] = [`user-git-${(await this.userMission.getGiteaUser()).username}`];
+
+    if(!this.userMission.isReviewing()) {
+      argsArray.push('.git');
+    }
+
     await copyProjectSources(
       GITEA_PATH_IC,
       MISSION_PATH_IC,
-      '.git',
-      `user-git-${(await this.userMission.getGiteaUser()).username}`,
+      ...argsArray
     );
+
     if (!this.userMission.isReviewing()) {
       renameTempToUserGitFiles(MISSION_PATH_IC, await gitMission.getAuthor());
     }
   }
 
   async setupFromRemoteRepo(gitMission: GitMission) {
-    const isRemoteRepoExist = await gitMission.isRemoteRepoExist();
-    if (isRemoteRepoExist) {
+    if (await gitMission.isRemoteRepoExist()) {
       // rm all except git directory pull remote code and setup
       await clearFilesExceptGit(GITEA_PATH_IC);
 
       await gitMission.fetch();
-      await gitMission.checkout('master');
       await gitMission.checkout('live');
     } else {
       await gitMission.commit('initial commit', ['--allow-empty']);
-      await gitMission.createRemoteBranch();
+      await gitMission.createRemoteBranch('master');
       await gitMission.createBranch('live');
     }
   }
@@ -63,7 +67,7 @@ export default class Recorder {
   async run() {
     try {
       await aquirePermissions();
-      // TODO refactor remove this
+      // TODO refactor make it as a sigleton
       this._gitMission = await new GitMission().init();
       await this.setupFromRemoteRepo(this._gitMission);
       await this.setupProject(this._gitMission);