Revert "slight fix, formatting"

This reverts commit 7c2536f2f080fd185c131718f791f7df90de2898.
Revert "more care for leak"

This reverts commit 51bf8279f166a5269d9777ddd82246a6cc8ee67a.
experimental changings