refactor and simply list