Wrapping up the refactoring