Incorporated changes suggested by @gvwilson