Refactoring, from can be list, from can be empty