Complete refactor helper