[IMP] Clean make_po a little bit