Refactor stocks