Cleaner text handling, remove some debug