watchlist indicator refactoring