Change to multiple return values.
Use go style variable naming.