Made "Wrap" a string extension, minor cleanups