Minor cleanup in client functionality