Improved Indenting