Refactoring, indicator divided