Indentation improvements