Add map Clean the code