Rename auxiliary structures
Use c++11 auto keyword
Reformat