Indentation correction.
Put map in a simple container.
Cleaned up transformations and code.
Removed console logs