Edits as suggested by @SheetJSDev