General cleaning up and simplifying the debugging ways.