Improve grunt command