Edits from @scottgonzalez feedback