Clean up logging a bit, and add table declaring table names