refactoring + gulp
gulp changes