Improve Grunt and Refactor