More cleanup of structures

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>