Clean code & Fix jshint issues