Rearranged table.h function declarations