Re-working indentation