Remove debug code, fix formatting.