more clean up and streamlining