Improve doc
Simplify naming
Remove useless stuff
Improve readability