[clean] refactoring