Formatting, test cleanup.