Add Grunt
Code clean up and date formatting