stock holdings refactor