Slightly better debug output at start and format clean up