Turning some return values into structs