Indentation improved