Fix: uniformize code