Further data format and code style fixes.