Finish Refactoring