Indicators - code cleanup