doc++
Simplify code