Reuse map marker objects + reorganize map.js