StockWatcher refactored