Changed variable names and updated Grunt structure