clean up map variabel generation