Made few other changes suggested by @caryp