Master refactor
fix JSParser