Lots of refactoring and worked on Portfolio classes