Clean up Client.info a bit