Much more cleanup -- attempting to maintain consistency