a little cleanup of post processing stuff in Main