StockFilter module and some cleanup.