Fit map to bounds of available markers

Clean up redundant code and variables