Re #880 Code format cleaning.