Make changes suggested by @gierschv