fix review comments

remove unnecessary changes, place old_addr under "public" comment.