Optimization, added new grunt tasks