update indention to 2 spaces
- Added support for map<,> types.

- More code formatting.