Fix: code design