Refactor debug output...