Fix: code smell