Remove some comments
Use unordered map