Fix docstrings
Reorganize client methods
Fix more php code sniff warnings