Refactored Hotspot section to better incorporate clustering