Refactored all the "initial" thing