Fix loop and cleanup

* Fix #2 by skipping replacing with ‘…’
* Clean up debugging info