Refactor to use grunt