Finish refactoring into partial