Improve automatic indentation