Setting game name, some code cleanup