Address comments: code clean up.