Clean up
Added portfolio assignmenst (ObserverPattern)