Refactoring TV and Portfolio