indicator and refactor