Finishing refactoring.