Refactor new game