Refactor ListController

Refactor ListController