Reorganize methods in Client

It was bothering me. Order matters, when it comes
to my own preference.