more cleanup based upon class discussion