Polish make_table and utility.h in general