Gulp file improvements