Cleaning + Added Grunt