Add new debug module
Formatting cleanup