Make remap non-destructive
Clean up vars and comments
Merge pull request #23 from chadhietala/bundling

Make Remap Non-Destructive