Refactoring portfolio to be smaller and more dedicated