[IMP] Code more clean