diff --git a/monkey/infection_monkey/post_breach/actions/clear_command_history.py b/monkey/infection_monkey/post_breach/actions/clear_command_history.py
index c4a95a302..e2286c8ab 100644
--- a/monkey/infection_monkey/post_breach/actions/clear_command_history.py
+++ b/monkey/infection_monkey/post_breach/actions/clear_command_history.py
@@ -1,9 +1,9 @@
 import subprocess
 
 from common.data.post_breach_consts import POST_BREACH_CLEAR_CMD_HISTORY
-from infection_monkey.post_breach.pba import PBA
 from infection_monkey.post_breach.clear_command_history.clear_command_history import \
     get_commands_to_clear_command_history
+from infection_monkey.post_breach.pba import PBA
 from infection_monkey.telemetry.post_breach_telem import PostBreachTelem
 
 
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js
index b0368aea1..d1c9c01ae 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js
@@ -6,21 +6,18 @@ export default function parsePbaResults(results) {
 const SHELL_STARTUP_NAME = 'Modify shell startup file';
 const CMD_HISTORY_NAME = 'Clear command history';
 
+const multipleResultsPbas = [SHELL_STARTUP_NAME, CMD_HISTORY_NAME]
+
 function aggregateMultipleResultsPba(results) {
-  let aggregatedPbaResults = {
-    'Modify shell startup file': {
-      aggregatedResult: undefined,
-      successfulOutputs: '',
-      failedOutputs: '',
-      isSuccess: false
-    },
-    'Clear command history': {
+  let aggregatedPbaResults = {};
+  multipleResultsPbas.forEach(function(pba) {
+    aggregatedPbaResults[pba] = {
       aggregatedResult: undefined,
       successfulOutputs: '',
       failedOutputs: '',
       isSuccess: false
     }
-  }
+  })
 
   function aggregateResults(result) {
     if (aggregatedPbaResults[result.name].aggregatedResult === undefined) {
@@ -30,30 +27,36 @@ function aggregateMultipleResultsPba(results) {
       aggregatedPbaResults[result.name].successfulOutputs += result.result[0];
       aggregatedPbaResults[result.name].isSuccess = true;
     }
-    if (!result.result[1]) {
+    else if (!result.result[1]) {
       aggregatedPbaResults[result.name].failedOutputs += result.result[0];
     }
   }
 
-  function checkAggregatedResults(pbaName) {
+  function checkAggregatedResults(pbaName) {  // if this pba's results were aggregated, push to `results`
     if (aggregatedPbaResults[pbaName].aggregatedResult !== undefined) {
-      aggregatedPbaResults[pbaName].aggregatedResult.result[0] = aggregatedPbaResults[pbaName].successfulOutputs + aggregatedPbaResults[pbaName].failedOutputs;
+      aggregatedPbaResults[pbaName].aggregatedResult.result[0] = (aggregatedPbaResults[pbaName].successfulOutputs +
+                                                                  aggregatedPbaResults[pbaName].failedOutputs);
       aggregatedPbaResults[pbaName].aggregatedResult.result[1] = aggregatedPbaResults[pbaName].isSuccess;
       results.push(aggregatedPbaResults[pbaName].aggregatedResult);
     }
   }
 
+  // check for pbas with multiple results and aggregate their results
   for (let i = 0; i < results.length; i++)
-    if (results[i].name === SHELL_STARTUP_NAME || results[i].name === CMD_HISTORY_NAME)
+    if (multipleResultsPbas.includes(results[i].name))
       aggregateResults(results[i]);
 
-  if (aggregatedPbaResults[SHELL_STARTUP_NAME].aggregatedResult === undefined &&
-      aggregatedPbaResults[CMD_HISTORY_NAME].aggregatedResult === undefined)
+  // if no modifications were made to the results, i.e. if no pbas had mutiple results, return `results` as it is
+  let noResultsModifications = true;
+  multipleResultsPbas.forEach((pba) => {
+    if (aggregatedPbaResults[pba].aggregatedResult !== undefined)
+      noResultsModifications = false;
+  })
+  if (noResultsModifications)
     return results;
 
+  // if modifications were made, push aggregated results to `results` and return
   results = results.filter(result => result.name !== SHELL_STARTUP_NAME && result.name !== CMD_HISTORY_NAME);
-  checkAggregatedResults(SHELL_STARTUP_NAME);
-  checkAggregatedResults(CMD_HISTORY_NAME);
-
+  multipleResultsPbas.forEach(pba => checkAggregatedResults(pba));
   return results;
 }