no-effect refactor?