More cleanup and review comments.