End of 1st Refactoring