#163 A few formal adjustments