Cleanup return types

[bwbush]

Create structures to replace generic return types.