Added table params and improved formatting.