Remove jQuery from js
Refactoring