some more textual clean-up, mostly tabs -> spaces + some reordering