refactor application.js
merge