Fix: refactoring