MOD: Refactoring