Towards to 3.1rd great Refactoring