more manual cleanup, avoiding indents