refactor and arrange lists a little bit