Refactor/view games