Improve tabular representation

See #43