refactors (severe diet) the move method