nakama refact

nakama refact