small changes suggested by @ximenesuk