[Clean] All refactoring