cleanup js a little and lint