Added some optimization with grunt