some more cleanup (reorganizeMain)