Some code clean-up on indicator