refactor js (again, again, agaign)