[MOD] Refactoring.