couple more cleanup items with init