Add suggestions from @florence, @aliceyoung9, @rpless