Move circle detection and drawing into header file
Update constants