Code Cleanup to use switch statements