Cleaned up MapsEngine a bit.