Clean up some logic and add some isXRP