Small refactor for clarity
Large refactor to standarized table printing procedure