Clean up conversion switch a little