clean up and add mapping to data analysis notebook