Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Adam Wood <a27fe73beb9aa27a78dbd278858a1822faec2cc9@google.com>
tensorflow/community,tensorflow/community,tensorflow/community,tensorflow/community,tensorflow/community