Formatting cleanup
Clean up parseTableName