Improved JS due to JSLint & grunt