Remove formatting; debug-flow fix