Cleanup and loading map

For Matt