refactoring proposal -> move