Grunt file refactoring. Minor directive refactoring.