Clean up turning circle code

Make order more logical.
This should not change the rendering.
Merge pull request #576 from math1985/turning-circle-cleanup

 Clean up turning circle code