more re-factoring and streamlining...