Updated with "self" usage in struct/class