refactor for pull request
rename delegate methods, change delegate property to weak , change comment