Some refactoring, fix title of one game