Made review changes suggested by @anssiko in #113