OurWallet Refactoring