Further struct simplification