#430 some formal adjustments