closer-to-right handling of indents
delete dead code