master
avoid delayed initialization, update tests
Clang-Format
introduce a struct to collect ESTokens and simplify initialization