Move map init to init function
Cleanup and documentation