Improve grunt tasks