untested good api-targeted refactor