gulpfile cleanup/refactor