Switch off by default
Code formatting
Simplify circle code