Refactor: small move