- Clear code
- add userId to webservice call