Gruntfile config update + some code improvements, tnx to jshint