Indenting improvements