Indentation handled more properly