Improve indent processing