[MOD] refactoring.