Made structs nicer