More clean up and review comments.