Game: Refactor for code readability