Refactored circle drawing