Indicator refactoring