Cleanup names-of-struct
Made struct variance initialization more correct.