implement changes suggested in line comments by @asreimer