minor edits based on feedback to the PR
Thanks to Timbo for the suggestion. This one is mostly based on the one from Atom.