Improved switch statement checking
4 files changed