Cosmetic changes and added wait for ramp down
Encapsulated the function KeepTrackIndicators