Completing a refactoring TODO