got rid of structs