Minor simplification in MAP
Move code