diff --git a/src/commands.ts b/src/commands.ts
index 2acaf6f..bd37f7b 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -1,9 +1,55 @@
 'use strict';
+import { ClearFileAnnotationsCommand } from './commands/clearFileAnnotations';
+import { CloseUnchangedFilesCommand } from './commands/closeUnchangedFiles';
+import { CopyMessageToClipboardCommand } from './commands/copyMessageToClipboard';
+import { CopyRemoteFileUrlToClipboardCommand } from './commands/copyRemoteFileUrlToClipboard';
+import { CopyShaToClipboardCommand } from './commands/copyShaToClipboard';
+import { DiffBranchWithBranchCommand } from './commands/diffBranchWithBranch';
+import { DiffDirectoryCommand } from './commands/diffDirectory';
+import { DiffLineWithPreviousCommand } from './commands/diffLineWithPrevious';
+import { DiffLineWithWorkingCommand } from './commands/diffLineWithWorking';
+import { DiffWithCommand } from './commands/diffWith';
+import { DiffWithBranchCommand } from './commands/diffWithBranch';
+import { DiffWithNextCommand } from './commands/diffWithNext';
+import { DiffWithPreviousCommand } from './commands/diffWithPrevious';
+import { DiffWithRevisionCommand } from './commands/diffWithRevision';
+import { DiffWithWorkingCommand } from './commands/diffWithWorking';
+import { ExternalDiffCommand } from './commands/externalDiff';
+import { OpenBranchesInRemoteCommand } from './commands/openBranchesInRemote';
+import { OpenBranchInRemoteCommand } from './commands/openBranchInRemote';
+import { OpenChangedFilesCommand } from './commands/openChangedFiles';
+import { OpenCommitInRemoteCommand } from './commands/openCommitInRemote';
+import { OpenFileInRemoteCommand } from './commands/openFileInRemote';
+import { OpenFileRevisionCommand } from './commands/openFileRevision';
+import { OpenInRemoteCommand } from './commands/openInRemote';
+import { OpenRepoInRemoteCommand } from './commands/openRepoInRemote';
+import { OpenWorkingFileCommand } from './commands/openWorkingFile';
+import { ResetSuppressedWarningsCommand } from './commands/resetSuppressedWarnings';
+import { ShowCommitSearchCommand } from './commands/showCommitSearch';
+import { ShowGitExplorerCommand } from './commands/showGitExplorer';
+import { ShowHistoryExplorerCommand } from './commands/showHistoryExplorer';
+import { ShowLastQuickPickCommand } from './commands/showLastQuickPick';
+import { ShowQuickBranchHistoryCommand } from './commands/showQuickBranchHistory';
+import { ShowQuickCommitDetailsCommand } from './commands/showQuickCommitDetails';
+import { ShowQuickCommitFileDetailsCommand } from './commands/showQuickCommitFileDetails';
+import { ShowQuickCurrentBranchHistoryCommand } from './commands/showQuickCurrentBranchHistory';
+import { ShowQuickFileHistoryCommand } from './commands/showQuickFileHistory';
+import { ShowQuickRepoStatusCommand } from './commands/showQuickRepoStatus';
+import { ShowQuickStashListCommand } from './commands/showQuickStashList';
+import { ShowResultsExplorerCommand } from './commands/showResultsExplorer';
+import { StashApplyCommand } from './commands/stashApply';
+import { StashDeleteCommand } from './commands/stashDelete';
+import { StashSaveCommand } from './commands/stashSave';
+import { SwitchModeCommand, ToggleReviewModeCommand, ToggleZenModeCommand } from './commands/switchMode';
+import { ToggleCodeLensCommand } from './commands/toggleCodeLens';
+import { ToggleFileBlameCommand } from './commands/toggleFileBlame';
+import { ToggleFileHeatmapCommand } from './commands/toggleFileHeatmap';
+import { ToggleFileRecentChangesCommand } from './commands/toggleFileRecentChanges';
+import { ToggleLineBlameCommand } from './commands/toggleLineBlame';
 import { CommandContext, setCommandContext } from './constants';
 import { Container } from './container';
 
 export * from './commands/common';
-
 export * from './commands/clearFileAnnotations';
 export * from './commands/closeUnchangedFiles';
 export * from './commands/copyMessageToClipboard';
@@ -52,58 +98,56 @@ export * from './commands/toggleFileHeatmap';
 export * from './commands/toggleFileRecentChanges';
 export * from './commands/toggleLineBlame';
 
-import * as Commands from './commands';
-
 export function configureCommands(): void {
     setCommandContext(CommandContext.KeyMap, Container.config.keymap);
 
-    Container.context.subscriptions.push(new Commands.ClearFileAnnotationsCommand());
-    Container.context.subscriptions.push(new Commands.CloseUnchangedFilesCommand());
-    Container.context.subscriptions.push(new Commands.CopyMessageToClipboardCommand());
-    Container.context.subscriptions.push(new Commands.CopyRemoteFileUrlToClipboardCommand());
-    Container.context.subscriptions.push(new Commands.CopyShaToClipboardCommand());
-    Container.context.subscriptions.push(new Commands.DiffBranchWithBranchCommand());
-    Container.context.subscriptions.push(new Commands.DiffDirectoryCommand());
-    Container.context.subscriptions.push(new Commands.DiffLineWithPreviousCommand());
-    Container.context.subscriptions.push(new Commands.DiffLineWithWorkingCommand());
-    Container.context.subscriptions.push(new Commands.DiffWithCommand());
-    Container.context.subscriptions.push(new Commands.DiffWithBranchCommand());
-    Container.context.subscriptions.push(new Commands.DiffWithNextCommand());
-    Container.context.subscriptions.push(new Commands.DiffWithPreviousCommand());
-    Container.context.subscriptions.push(new Commands.DiffWithRevisionCommand());
-    Container.context.subscriptions.push(new Commands.DiffWithWorkingCommand());
-    Container.context.subscriptions.push(new Commands.ExternalDiffCommand());
-    Container.context.subscriptions.push(new Commands.OpenBranchesInRemoteCommand());
-    Container.context.subscriptions.push(new Commands.OpenBranchInRemoteCommand());
-    Container.context.subscriptions.push(new Commands.OpenChangedFilesCommand());
-    Container.context.subscriptions.push(new Commands.OpenCommitInRemoteCommand());
-    Container.context.subscriptions.push(new Commands.OpenFileInRemoteCommand());
-    Container.context.subscriptions.push(new Commands.OpenFileRevisionCommand());
-    Container.context.subscriptions.push(new Commands.OpenInRemoteCommand());
-    Container.context.subscriptions.push(new Commands.OpenRepoInRemoteCommand());
-    Container.context.subscriptions.push(new Commands.OpenWorkingFileCommand());
-    Container.context.subscriptions.push(new Commands.ResetSuppressedWarningsCommand());
-    Container.context.subscriptions.push(new Commands.ShowCommitSearchCommand());
-    Container.context.subscriptions.push(new Commands.ShowGitExplorerCommand());
-    Container.context.subscriptions.push(new Commands.ShowHistoryExplorerCommand());
-    Container.context.subscriptions.push(new Commands.ShowLastQuickPickCommand());
-    Container.context.subscriptions.push(new Commands.ShowQuickBranchHistoryCommand());
-    Container.context.subscriptions.push(new Commands.ShowQuickCommitDetailsCommand());
-    Container.context.subscriptions.push(new Commands.ShowQuickCommitFileDetailsCommand());
-    Container.context.subscriptions.push(new Commands.ShowQuickCurrentBranchHistoryCommand());
-    Container.context.subscriptions.push(new Commands.ShowQuickFileHistoryCommand());
-    Container.context.subscriptions.push(new Commands.ShowQuickRepoStatusCommand());
-    Container.context.subscriptions.push(new Commands.ShowQuickStashListCommand());
-    Container.context.subscriptions.push(new Commands.ShowResultsExplorerCommand());
-    Container.context.subscriptions.push(new Commands.StashApplyCommand());
-    Container.context.subscriptions.push(new Commands.StashDeleteCommand());
-    Container.context.subscriptions.push(new Commands.StashSaveCommand());
-    Container.context.subscriptions.push(new Commands.SwitchModeCommand());
-    Container.context.subscriptions.push(new Commands.ToggleCodeLensCommand());
-    Container.context.subscriptions.push(new Commands.ToggleFileBlameCommand());
-    Container.context.subscriptions.push(new Commands.ToggleFileHeatmapCommand());
-    Container.context.subscriptions.push(new Commands.ToggleFileRecentChangesCommand());
-    Container.context.subscriptions.push(new Commands.ToggleLineBlameCommand());
-    Container.context.subscriptions.push(new Commands.ToggleReviewModeCommand());
-    Container.context.subscriptions.push(new Commands.ToggleZenModeCommand());
+    Container.context.subscriptions.push(new ClearFileAnnotationsCommand());
+    Container.context.subscriptions.push(new CloseUnchangedFilesCommand());
+    Container.context.subscriptions.push(new CopyMessageToClipboardCommand());
+    Container.context.subscriptions.push(new CopyRemoteFileUrlToClipboardCommand());
+    Container.context.subscriptions.push(new CopyShaToClipboardCommand());
+    Container.context.subscriptions.push(new DiffBranchWithBranchCommand());
+    Container.context.subscriptions.push(new DiffDirectoryCommand());
+    Container.context.subscriptions.push(new DiffLineWithPreviousCommand());
+    Container.context.subscriptions.push(new DiffLineWithWorkingCommand());
+    Container.context.subscriptions.push(new DiffWithCommand());
+    Container.context.subscriptions.push(new DiffWithBranchCommand());
+    Container.context.subscriptions.push(new DiffWithNextCommand());
+    Container.context.subscriptions.push(new DiffWithPreviousCommand());
+    Container.context.subscriptions.push(new DiffWithRevisionCommand());
+    Container.context.subscriptions.push(new DiffWithWorkingCommand());
+    Container.context.subscriptions.push(new ExternalDiffCommand());
+    Container.context.subscriptions.push(new OpenBranchesInRemoteCommand());
+    Container.context.subscriptions.push(new OpenBranchInRemoteCommand());
+    Container.context.subscriptions.push(new OpenChangedFilesCommand());
+    Container.context.subscriptions.push(new OpenCommitInRemoteCommand());
+    Container.context.subscriptions.push(new OpenFileInRemoteCommand());
+    Container.context.subscriptions.push(new OpenFileRevisionCommand());
+    Container.context.subscriptions.push(new OpenInRemoteCommand());
+    Container.context.subscriptions.push(new OpenRepoInRemoteCommand());
+    Container.context.subscriptions.push(new OpenWorkingFileCommand());
+    Container.context.subscriptions.push(new ResetSuppressedWarningsCommand());
+    Container.context.subscriptions.push(new ShowCommitSearchCommand());
+    Container.context.subscriptions.push(new ShowGitExplorerCommand());
+    Container.context.subscriptions.push(new ShowHistoryExplorerCommand());
+    Container.context.subscriptions.push(new ShowLastQuickPickCommand());
+    Container.context.subscriptions.push(new ShowQuickBranchHistoryCommand());
+    Container.context.subscriptions.push(new ShowQuickCommitDetailsCommand());
+    Container.context.subscriptions.push(new ShowQuickCommitFileDetailsCommand());
+    Container.context.subscriptions.push(new ShowQuickCurrentBranchHistoryCommand());
+    Container.context.subscriptions.push(new ShowQuickFileHistoryCommand());
+    Container.context.subscriptions.push(new ShowQuickRepoStatusCommand());
+    Container.context.subscriptions.push(new ShowQuickStashListCommand());
+    Container.context.subscriptions.push(new ShowResultsExplorerCommand());
+    Container.context.subscriptions.push(new StashApplyCommand());
+    Container.context.subscriptions.push(new StashDeleteCommand());
+    Container.context.subscriptions.push(new StashSaveCommand());
+    Container.context.subscriptions.push(new SwitchModeCommand());
+    Container.context.subscriptions.push(new ToggleCodeLensCommand());
+    Container.context.subscriptions.push(new ToggleFileBlameCommand());
+    Container.context.subscriptions.push(new ToggleFileHeatmapCommand());
+    Container.context.subscriptions.push(new ToggleFileRecentChangesCommand());
+    Container.context.subscriptions.push(new ToggleLineBlameCommand());
+    Container.context.subscriptions.push(new ToggleReviewModeCommand());
+    Container.context.subscriptions.push(new ToggleZenModeCommand());
 }