Refactor and added Pys2JS