minor refactors in map (removed magic numbers, etc)