Correct initial state of codebase