Edits suggested by @patik