[Refactoring] Cleanning