Map.js partially refactored