"Improve" replacement

Make the replacement more "robust" but using a modified version
of https://github.com/panicsteve/cloud-to-butt