[ref] Big refactoring part7 (FINAL FLUSH)