Without tests, there can be no real refactors, but nevertheless I have refactored the list loader.