more cleanup, refinements