ListActiveState refactor