cleanup map constructor/initialise code