- General code cleanup
- Circle detection improvement