Refactoring is done. Time to make the new game