and Barry happy. Got rid of some extra variable declarations.
Attach a file by drag & drop or click to upload
