Improve grunt targets