Refactoring Finished