Index to the BitSets rather than Map key and tidy up code
Focused border shouldn't be round