[fix] better code