Further streamlining of initialize/finalize