Tidy/refactor List handler