[FIX] refactoring