Refactor mpd client object