Addresses PR comments.

Paired with tOkeshu