Debatable value-add refactor