- Extract Method pattern applied to switch
- Variables renamed