Second commit, refactor gulpjs