Code clean up in 1-map module