Leaftlet Refactor Complete