Incorporate stylistic changes suggested by @dhylands