Moved the list view di stuff into its own class.