updating gulp/minor refactoring