Refactor InifiteIndicator,need to optimize