some refactorings
list moves