Refactoring Step 1 complete: Extracted Switch statement into method