Add isXRP and clean up logic