Reformat everything
Rename the debug handler