Revert "- Change initialization step of some varialbe in Builder"

This reverts commit aabd97a6e1eb1f91d236eec9f9b54a73c4b4b326.