Code clean-up, add map zoom to fit markers on load