Refactor grunt run