Light refactoring on indicators
Light refactoring on indicators