Refactor method to be least invasive in existing codebase