Clean up turning circle code

Make order more logical.
This should not change the rendering.