Working on results screen / refactoring game code