[REF] Refactoring design