Tidy for review comments.