Improved automatic indentation