Cleaned up client.rb