refactored a type if-then-else monster into a for_each loop and exlcuded a...

refactored a type if-then-else monster into a for_each loop and exlcuded a pure cout function from the converage report