Finishing refactoring chore