Finishing the refactoring