Game redesign done, just a little cleanup needed