Updating Portfolio & some Cleanup