Refactor Tidy Wallet Tasks + More Locking Improvements