Coding style is now more consistent accross the app
Recycle HashMap instance to avoid aggressive garbage collection
Remove useless import
It's a bit prettier like this
Add TODO comment