Code improvement. Review comment by Eric V. Smith