Move and refactor