improvments derivated from comments