Improve code and copy in initializer

[ci skip]