Refactor initialization methods