updated gulp and refactored