Addressed more review comments.
cleanup