Simplify initializer code