Beginning leaflet calls refactoring