Update weakSelf to remove redundant referencing