Ongoing reneg refactoring