improve initializer handling