Improve grunt build