Further fixes to indentation