Refactor
Finish pull data from sever