Refactoring lists a bit