A few edits in response to @hlapp's suggestions