Refactor ListFragment