Clean up switch/case logic