Refactoring and adding of Zepto compatibility