Refactoring Gulp plugin version #6