Merged two fragments for MatchGame, cleaned code