refactor map
Merge pull request #71 from kyledaugherty/refactor

refactor map