Refactor Initialization