moving and refactoring