refactored code, updated gulp settings