Improve some initializer