Code cleaning
Started on resolution bug with map