extracted current_client into its own method
Merge pull request #5 from coderly/make-current-device-available

extracted current_client into its own method