Add cluster to map immediately
Refactor for speed and readability