Remove js
Remove unnecessary function
Simplify
Remove console.log