Update Grunt config
Code optimizations