Completed zepto refactor