Cleaned up map-module.js