Refactoring and filling the indicators.