More CR cleanup (formatting)