Improve switch conventions