more cleanup (mainly tabularize)