Improved Indentation