Cleaned up PortfolioService