Refactor: Move function