[CHANGE] refactor initialization