Minor grunt refactor