Refactoring, started ellipse-detection.