Code clean for user remote API