Cleanup switch statement, curlies unnecessary