minor enhancements in indentation logic