Refactor ListController.