Refactoring and correcting some indicators.