Simplify tidy
Merge pull request #48 from lucasmichot/factorize-tidy

Factorize tidy