Text improvements by @diegoeis