linted

now to reorganize and simplify for js