Finishing game refactor