Issue #20 - Reduce switch case complexity
Issue #20 - Reduce cyclomatic complexity