Code cleanup in map file