Indenting cleanups of serialization struct