Made indentation a bit cleverer, but not too much.