Fix struct
Clean up