Add debug info and clean the output