Cleaner portfolio buy/sell impl