[fix] Code cosmetics
[fix] Client json response