Now modify code with escodegen
Some code cleanup
Updated docs