improve npm scripts and grunt tasks