refactor grunt tasks