#283 Indentation improved