improve a bit previous commit