Cleaned ListController code.