[MOD] refactoring