Cleaned up ``Zepto\Zepto`` a bit
Various cleanups