Tidy up Grunt tasks