Refactorings + trades/pending count