Cleanup of code, add active/inactive hotSpot radius