Refactor map bounds listener out