cleanup and preparation
more streamlining