Addressed some review comments.