cleaning, fixed mapping