Fix some formatting.
Remove some debug code.