#383 A few formal adjustments