Refactored circleClicked a bit..
Refactored circleClick a bit..