Addresses comments in #39